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.326 by root, Sun Jul 16 20:04:08 2006 UTC vs.
Revision 1.370 by root, Sun Jul 15 21:02:20 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
		273	sub TO_JSON {
		274	{ __widget_ref__ => $_[0]{s_id} }
		275	}
		276
247	sub show {	277	sub show {
248	my ($self) = @_;	278	my ($self) = @_;
249		279
250	return if $self->{parent};	280	return if $self->{parent};
251		281
252	$CFClient::UI::ROOT->add ($self);	282	$CFPlus::UI::ROOT->add ($self);
253	}	283	}
254		284
255	sub set_visible {	285	sub set_visible {
256	my ($self) = @_;	286	my ($self) = @_;
257		287
…		…
278	delete $self->{root};	308	delete $self->{root};
279		309
280	undef $GRAB if $GRAB == $self;	310	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	311	undef $HOVER if $HOVER == $self;
282		312
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	314	if $TOOLTIP->{owner} == $self;
285		315
286	$self->emit ("focus_out");	316	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
288	}	318	}
…		…
290	sub set_visibility {	320	sub set_visibility {
291	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
292		322
293	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
294		324
295	$visible ? $self->hide	325	$visible ? $self->show
296	: $self->show;	326	: $self->hide;
297	}	327	}
298		328
299	sub toggle_visibility {	329	sub toggle_visibility {
300	my ($self) = @_;	330	my ($self) = @_;
301		331
…		…
345	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
346		376
347	if ($self->{aspect}) {	377	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
349		379
350	$w = List::Util::min $w, int $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		382
353	# use alignment to adjust x, y	383	# use alignment to adjust x, y
354		384
355	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
397		427
398	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
399		429
400	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
401		431
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	435	}
406	}	436	}
407		437
408	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
409	sub coord2local {	439	sub coord2local {
410	my ($self, $x, $y) = @_;	440	my ($self, $x, $y) = @_;
411		441
		442	Carp::confess unless $self->{parent};#d#
		443
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	445	}
414		446
415	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
416	sub coord2global {	448	sub coord2global {
417	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
418		450
		451	Carp::confess unless $self->{parent};#d#
		452
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	454	}
421		455
422	sub invoke_focus_in {	456	sub invoke_focus_in {
423	my ($self) = @_;	457	my ($self) = @_;
…		…
452		486
453	$FOCUS->emit ("focus_out") if $FOCUS;	487	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	488	$self->emit ("focus_in");
455	}	489	}
456		490
457	sub invoke_mouse_motion { 1 }	491	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	492	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	493	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	494	sub invoke_key_up { 0 }
		495	sub invoke_mouse_wheel { 0 }
461		496
462	sub invoke_button_down {	497	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	498	my ($self, $ev, $x, $y) = @_;
464		499
465	$self->grab_focus;	500	$self->grab_focus;
466		501
467	1	502	0
468	}	503	}
469		504
470	sub connect {	505	sub connect {
471	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
472		507
473	push @{ $self->{signal_cb}{$signal} }, $cb;	508	push @{ $self->{signal_cb}{$signal} }, $cb;
		509
		510	defined wantarray and CFPlus::guard {
		511	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		512	@{ $self->{signal_cb}{$signal} };
		513	}
474	}	514	}
		515
		516	sub disconnect_all {
		517	my ($self, $signal) = @_;
		518
		519	delete $self->{signal_cb}{$signal};
		520	}
		521
		522	my %has_coords = (
		523	button_down => 1,
		524	button_up => 1,
		525	mouse_motion => 1,
		526	mouse_wheel => 1,
		527	);
475		528
476	sub emit {	529	sub emit {
477	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
478		531
479	#d##TODO# stop propagating at first true, do not use sum	532	# 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	533	# and needlessly verbose code, either.
		534	my @append
		535	= $has_coords{$signal}
		536	? $args[0]->xy ($self)
		537	: ();
		538
		539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		540
		541	for my $cb (
		542	@{$self->{signal_cb}{$signal} || []}, # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	543	($self->can ("invoke_$signal") || sub { 1 }), # closure
		544	) {
		545	return $cb->($self, @args, @append) || next;
		546	}
		547
		548	# parent
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	550	}
484		551
485	sub find_widget {	552	sub find_widget {
486	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
487		554
…		…
495	}	562	}
496		563
497	sub set_parent {	564	sub set_parent {
498	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
499		566
500	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
502	}	569	}
503		570
504	sub realloc {	571	sub realloc {
505	my ($self) = @_;	572	my ($self) = @_;
…		…
571	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
574	glEnd;	641	glEnd;
575	glPopMatrix;	642	glPopMatrix;
576	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	643	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577	}	644	}
578		645
579	$self->_draw;	646	$self->_draw;
580	glPopMatrix;	647	glPopMatrix;
581	}	648	}
…		…
584	my ($self) = @_;	651	my ($self) = @_;
585		652
586	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
587	}	654	}
588		655
		656	my $cntx;#d#
589	sub DESTROY {	657	sub DESTROY {
590	my ($self) = @_;	658	my ($self) = @_;
591		659
592	return if CFClient::in_destruct;	660	return if CFPlus::in_destruct;
593
594	delete $WIDGET{$self+0};
595		661
596	eval { $self->destroy };	662	eval { $self->destroy };
597	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		664
		665	delete $WIDGET{$self+0};
598	}	666	}
599		667
600	#############################################################################	668	#############################################################################
601		669
602	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
603		671
604	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
605		673
606	use strict;	674	use strict;
607	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
608		676
609	sub new {	677	sub new {
610	my $class = shift;	678	my $class = shift;
611		679
612	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
643	}	711	}
644	}	712	}
645		713
646	#############################################################################	714	#############################################################################
647		715
648	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
649		717
650	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
651		719
652	sub new {	720	sub new {
653	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
654	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
655	}	723	}
…		…
662		730
663	sub draw { }	731	sub draw { }
664		732
665	#############################################################################	733	#############################################################################
666		734
667	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
668		736
669	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
670		738
671	sub new {	739	sub new {
672	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
673		741
674	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
683	if $children;	751	if $children;
684		752
685	$self	753	$self
686	}	754	}
687		755
		756	sub realloc {
		757	my ($self) = @_;
		758
		759	$self->{force_realloc} = 1;
		760	$self->{force_size_alloc} = 1;
		761	$self->SUPER::realloc;
		762	}
		763
688	sub add {	764	sub add {
689	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
690		766
691	$_->set_parent ($self)	767	$_->set_parent ($self)
692	for @widgets;	768	for @widgets;
…		…
752	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
753	}	829	}
754		830
755	#############################################################################	831	#############################################################################
756		832
757	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
758		834
759	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
760		836
761	sub new {	837	sub new {
762	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
763		839
764	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765		841
766	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
767	}	843	}
768		844
769	sub add {	845	sub add {
…		…
776	sub remove {	852	sub remove {
777	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
778		854
779	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
780		856
781	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
782	unless @{$self->{children}};	858	unless @{$self->{children}};
783	}	859	}
784		860
785	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
786		862
…		…
798		874
799	#############################################################################	875	#############################################################################
800		876
801	# back-buffered drawing area	877	# back-buffered drawing area
802		878
803	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
804		880
805	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
806		882
807	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
808		884
809	sub new {	885	sub new {
810	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
811		887
812	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
834	}	910	}
835		911
836	sub render_child {	912	sub render_child {
837	my ($self) = @_;	913	my ($self) = @_;
838		914
839	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	915	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
842		918
843	{	919	{
844	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
845		921
846	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
848	}	926	}
849
850	$self->_render;
851	};	927	};
852	}	928	}
853		929
854	sub _draw {	930	sub _draw {
855	my ($self) = @_;	931	my ($self) = @_;
856
857	my ($w, $h) = @$self{qw(w h)};
858		932
859	my $tex = $self->{texture}	933	my $tex = $self->{texture}
860	or return;	934	or return;
861		935
862	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
865		939
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
867		941
868	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
869	}	943	}
870		944
871	#############################################################################	945	#############################################################################
872		946
873	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
874		948
875	our @ISA = CFClient::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
876		950
877	sub new {	951	sub new {
878	my $class = shift;	952	my $class = shift;
879		953
880	$class->SUPER::new (	954	$class->SUPER::new (
…		…
940	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
942	) {	1016	) {
943	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1017	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944	} else {	1018	} else {
945	$self->CFClient::UI::Base::find_widget ($x, $y)	1019	$self->CFPlus::UI::Base::find_widget ($x, $y)
946	}	1020	}
947	}	1021	}
948		1022
949	sub _render {	1023	sub _render {
950	my ($self) = @_;	1024	my ($self) = @_;
951		1025
952	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1026	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
953	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1027	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954		1028
955	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1029	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956		1030
957	$self->SUPER::_render;	1031	$self->SUPER::_render;
958	}	1032	}
959		1033
960	#############################################################################	1034	#############################################################################
961		1035
962	package CFClient::UI::ScrolledWindow;	1036	package CFPlus::UI::ScrolledWindow;
963		1037
964	our @ISA = CFClient::UI::HBox::;	1038	our @ISA = CFPlus::UI::Table::;
965		1039
966	sub new {	1040	sub new {
967	my ($class, %arg) = @_;	1041	my ($class, %arg) = @_;
968		1042
969	my $child = delete $arg{child};	1043	my $child = delete $arg{child};
970		1044
971	my $self;	1045	my $self;
972		1046
973	my $slider = new CFClient::UI::Slider	1047	my $hslider = new CFPlus::UI::Slider
		1048	vertical => 0,
		1049	range => [0, 0, 1, 0.01], # HACK fix
		1050	on_changed => sub {
		1051	$self->{hpos} = $_[1];
		1052	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1053	},
		1054	;
		1055
		1056	my $vslider = new CFPlus::UI::Slider
974	vertical => 1,	1057	vertical => 1,
975	range => [0, 0, 1, 0.01], # HACK fix	1058	range => [0, 0, 1, 0.01], # HACK fix
976	on_changed => sub {	1059	on_changed => sub {
977	$self->{vp}->set_offset (0, $_[1]);	1060	$self->{vpos} = $_[1];
		1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
978	},	1062	},
979	;	1063	;
980		1064
981	$self = $class->SUPER::new (	1065	$self = $class->SUPER::new (
982	vp => (new CFClient::UI::ViewPort expand => 1),	1066	vp => (new CFPlus::UI::ViewPort expand => 1),
		1067	can_events => 1,
983	slider => $slider,	1068	hslider => $hslider,
		1069	vslider => $vslider,
		1070	col_expand => [1, 0],
		1071	row_expand => [1, 0],
984	%arg,	1072	%arg,
985	);	1073	);
986		1074
		1075	$self->SUPER::add (0, 0, $self->{vp});
987	$self->SUPER::add ($self->{vp}, $self->{slider});	1076	$self->SUPER::add (1, 0, $self->{vslider});
		1077	$self->SUPER::add (0, 1, $self->{hslider});
		1078
988	$self->add ($child) if $child;	1079	$self->add ($child) if $child;
989		1080
990	$self	1081	$self
991	}	1082	}
992		1083
…		…
996	my ($self, $widget) = @_;	1087	my ($self, $widget) = @_;
997		1088
998	$self->{vp}->add ($self->{child} = $widget);	1089	$self->{vp}->add ($self->{child} = $widget);
999	}	1090	}
1000		1091
		1092	sub invoke_mouse_wheel {
		1093	my ($self, $ev) = @_;
		1094
		1095	return 0 unless $ev->{dy}; # only vertical movements
		1096
		1097	$self->{vslider}->emit (mouse_wheel => $ev);
		1098
		1099	1
		1100	}
		1101
1001	sub update_slider {	1102	sub update_slider {
1002	my ($self) = @_;	1103	my ($self) = @_;
1003		1104
		1105	my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1106	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1107	#$self->{hslider}->set_visibility ($w1 != $w2);
		1108
		1109	my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h});
		1110	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1111	#$self->{vslider}->set_visibility ($h1 != $h2);
1005	}	1112	}
1006		1113
1007	sub update {	1114	sub update {
1008	my ($self) = @_;	1115	my ($self) = @_;
1009		1116
1010	$self->SUPER::update;	1117	$self->SUPER::update;
1011
1012	$self->update_slider;	1118	$self->update_slider;
1013	}	1119	}
1014		1120
1015	sub invoke_size_allocate {	1121	sub invoke_size_allocate {
1016	my ($self, $w, $h) = @_;	1122	my ($self, $w, $h) = @_;
1017		1123
1018	$self->update_slider;	1124	$self->update_slider;
1019
1020	$self->SUPER::invoke_size_allocate ($w, $h)	1125	$self->SUPER::invoke_size_allocate ($w, $h)
1021	}	1126	}
1022		1127
1023	#############################################################################	1128	#############################################################################
1024		1129
1025	package CFClient::UI::Frame;	1130	package CFPlus::UI::Frame;
1026		1131
1027	our @ISA = CFClient::UI::Bin::;	1132	our @ISA = CFPlus::UI::Bin::;
1028		1133
1029	use CFClient::OpenGL;	1134	use CFPlus::OpenGL;
1030		1135
1031	sub new {	1136	sub new {
1032	my $class = shift;	1137	my $class = shift;
1033		1138
1034	$class->SUPER::new (	1139	$class->SUPER::new (
…		…
1060	$self->SUPER::_draw;	1165	$self->SUPER::_draw;
1061	}	1166	}
1062		1167
1063	#############################################################################	1168	#############################################################################
1064		1169
1065	package CFClient::UI::FancyFrame;	1170	package CFPlus::UI::FancyFrame;
1066		1171
1067	our @ISA = CFClient::UI::Bin::;	1172	our @ISA = CFPlus::UI::Bin::;
1068		1173
1069	use CFClient::OpenGL;	1174	use CFPlus::OpenGL;
		1175
		1176	sub new {
		1177	my ($class, %arg) = @_;
		1178
		1179	if ((exists $arg{label}) && !ref $arg{label}) {
		1180	$arg{label} = new CFPlus::UI::Label
		1181	align => 1,
		1182	valign => 0,
		1183	text => $arg{label},
		1184	fontsize => ($arg{border} || 0.8) * 0.75;
		1185	}
		1186
		1187	my $self = $class->SUPER::new (
		1188	# label => "",
		1189	fg => [0.6, 0.3, 0.1],
		1190	border => 0.8,
		1191	style => 'single',
		1192	%arg,
		1193	);
		1194
		1195	$self
		1196	}
		1197
		1198	sub add {
		1199	my ($self, @widgets) = @_;
		1200
		1201	$self->SUPER::add (@widgets);
		1202	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1203	}
		1204
		1205	sub border {
		1206	int $_[0]{border} * $::FONTSIZE
		1207	}
		1208
		1209	sub size_request {
		1210	my ($self) = @_;
		1211
		1212	($self->{label_w}, undef) = $self->{label}->size_request
		1213	if $self->{label};
		1214
		1215	my ($w, $h) = $self->SUPER::size_request;
		1216
		1217	(
		1218	$w + $self->border * 2,
		1219	$h + $self->border * 2,
		1220	)
		1221	}
		1222
		1223	sub invoke_size_allocate {
		1224	my ($self, $w, $h) = @_;
		1225
		1226	my $border = $self->border;
		1227
		1228	$w -= List::Util::max 0, $border * 2;
		1229	$h -= List::Util::max 0, $border * 2;
		1230
		1231	if (my $label = $self->{label}) {
		1232	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1233	$label->{h} = List::Util::min $h, $border;
		1234	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1235	}
		1236
		1237	$self->child->configure ($border, $border, $w, $h);
		1238
		1239	1
		1240	}
		1241
		1242	sub _draw {
		1243	my ($self) = @_;
		1244
		1245	my $child = $self->{children}[0];
		1246
		1247	my $border = $self->border;
		1248	my ($w, $h) = ($self->{w}, $self->{h});
		1249
		1250	$child->draw;
		1251
		1252	glColor @{$self->{fg}};
		1253	glBegin GL_LINE_STRIP;
		1254	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1255	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1256	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1257	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1258	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1259	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1260	glEnd;
		1261
		1262	if ($self->{label}) {
		1263	glTranslate $border * 2, 0;
		1264	$self->{label}->_draw;
		1265	}
		1266	}
		1267
		1268	#############################################################################
		1269
		1270	package CFPlus::UI::Toplevel;
		1271
		1272	our @ISA = CFPlus::UI::Bin::;
		1273
		1274	use CFPlus::OpenGL;
1070		1275
1071	my $bg =	1276	my $bg =
1072	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1277	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1073	mipmap => 1, wrap => 1;	1278	mipmap => 1, wrap => 1;
1074		1279
1075	my @border =	1280	my @border =
1076	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1281	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1077	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1282	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1078		1283
1079	sub new {	1284	sub new {
1080	my ($class, %arg) = @_;	1285	my ($class, %arg) = @_;
1081		1286
…		…
1087	min_w => 64,	1292	min_w => 64,
1088	min_h => 32,	1293	min_h => 32,
1089	%arg,	1294	%arg,
1090	);	1295	);
1091		1296
1092	$self->{title_widget} = new CFClient::UI::Label	1297	$self->{title_widget} = new CFPlus::UI::Label
1093	align => 0,	1298	align => 0,
1094	valign => 1,	1299	valign => 1,
1095	text => $self->{title},	1300	text => $self->{title},
1096	fontsize => $self->{border},	1301	fontsize => $self->{border},
1097	if exists $self->{title};	1302	if exists $self->{title};
1098		1303
1099	if ($self->{has_close_button}) {	1304	if ($self->{has_close_button}) {
1100	$self->{close_button} =	1305	$self->{close_button} =
1101	new CFClient::UI::ImageButton	1306	new CFPlus::UI::ImageButton
1102	path => 'x1_close.png',	1307	path => 'x1_close.png',
1103	on_activate => sub { $self->emit ("delete") };	1308	on_activate => sub { $self->emit ("delete") };
1104		1309
1105	$self->CFClient::UI::Container::add ($self->{close_button});	1310	$self->CFPlus::UI::Container::add ($self->{close_button});
1106	}	1311	}
1107		1312
1108	$self	1313	$self
1109	}	1314	}
1110		1315
1111	sub add {	1316	sub add {
1112	my ($self, @widgets) = @_;	1317	my ($self, @widgets) = @_;
1113		1318
1114	$self->SUPER::add (@widgets);	1319	$self->SUPER::add (@widgets);
1115	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1320	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1116	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1321	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1117	}	1322	}
1118		1323
1119	sub border {	1324	sub border {
1120	int $_[0]{border} * $::FONTSIZE	1325	int $_[0]{border} * $::FONTSIZE
1121	}	1326	}
…		…
1229	$self->{motion}->($ev, $x, $y) if $self->{motion};	1434	$self->{motion}->($ev, $x, $y) if $self->{motion};
1230		1435
1231	! ! $self->{motion}	1436	! ! $self->{motion}
1232	}	1437	}
1233		1438
		1439	sub invoke_visibility_change {
		1440	my ($self, $visible) = @_;
		1441
		1442	delete $self->{motion} unless $visible;
		1443
		1444	0
		1445	}
		1446
1234	sub _draw {	1447	sub _draw {
1235	my ($self) = @_;	1448	my ($self) = @_;
1236		1449
1237	my $child = $self->{children}[0];	1450	my $child = $self->{children}[0];
1238		1451
…		…
1275	if $self->{close_button};	1488	if $self->{close_button};
1276	}	1489	}
1277		1490
1278	#############################################################################	1491	#############################################################################
1279		1492
1280	package CFClient::UI::Table;	1493	package CFPlus::UI::Table;
1281		1494
1282	our @ISA = CFClient::UI::Base::;	1495	our @ISA = CFPlus::UI::Base::;
1283		1496
1284	use List::Util qw(max sum);	1497	use List::Util qw(max sum);
1285		1498
1286	use CFClient::OpenGL;	1499	use CFPlus::OpenGL;
1287		1500
1288	sub new {	1501	sub new {
1289	my $class = shift;	1502	my $class = shift;
1290		1503
1291	$class->SUPER::new (	1504	$class->SUPER::new (
1292	col_expand => [],	1505	col_expand => [],
		1506	row_expand => [],
1293	@_,	1507	@_,
1294	)	1508	)
1295	}	1509	}
1296		1510
1297	sub children {	1511	sub children {
1298	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1512	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1299	}	1513	}
1300		1514
1301	sub add {	1515	sub add {
1302	my ($self, $x, $y, $child) = @_;	1516	my ($self) = shift;
1303		1517
		1518	while (@_) {
		1519	my ($x, $y, $child) = splice @_, 0, 3, ();
1304	$child->set_parent ($self);	1520	$child->set_parent ($self);
1305	$self->{children}[$y][$x] = $child;	1521	$self->{children}[$y][$x] = $child;
		1522	}
1306		1523
		1524	$self->{force_realloc} = 1;
		1525	$self->{force_size_alloc} = 1;
1307	$self->realloc;	1526	$self->realloc;
1308	}	1527	}
1309		1528
1310	sub remove {	1529	sub remove {
1311	my ($self, $child) = @_;	1530	my ($self, $child) = @_;
…		…
1367	my ($ws, $hs) = $self->get_wh;	1586	my ($ws, $hs) = $self->get_wh;
1368		1587
1369	my $req_w = (sum @$ws) || 1;	1588	my $req_w = (sum @$ws) || 1;
1370	my $req_h = (sum @$hs) || 1;	1589	my $req_h = (sum @$hs) || 1;
1371		1590
1372	# TODO: nicer code && do row_expand	1591	# TODO: nicer code
1373	my @col_expand = @{$self->{col_expand}};	1592	my @col_expand = @{$self->{col_expand}};
1374	@col_expand = (1) x @$ws unless @col_expand;	1593	@col_expand = (1) x @$ws unless @col_expand;
1375	my $col_expand = (sum @col_expand) || 1;	1594	my $col_expand = (sum @col_expand) || 1;
1376		1595
1377	# linearly scale sizes
1378	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1596	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1379	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1380		1597
1381	CFClient::UI::harmonize $ws;	1598	CFPlus::UI::harmonize $ws;
		1599
		1600	my @row_expand = @{$self->{row_expand}};
		1601	@row_expand = (1) x @$ws unless @row_expand;
		1602	my $row_expand = (sum @row_expand) || 1;
		1603
		1604	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1605
1382	CFClient::UI::harmonize $hs;	1606	CFPlus::UI::harmonize $hs;
1383		1607
1384	my $y;	1608	my $y;
1385		1609
1386	for my $r (0 .. $#{$self->{children}}) {	1610	for my $r (0 .. $#{$self->{children}}) {
1387	my $row = $self->{children}[$r]	1611	my $row = $self->{children}[$r]
…		…
1430	}	1654	}
1431	}	1655	}
1432		1656
1433	#############################################################################	1657	#############################################################################
1434		1658
1435	package CFClient::UI::Box;	1659	package CFPlus::UI::Box;
1436		1660
1437	our @ISA = CFClient::UI::Container::;	1661	our @ISA = CFPlus::UI::Container::;
1438		1662
1439	sub size_request {	1663	sub size_request {
1440	my ($self) = @_;	1664	my ($self) = @_;
1441		1665
1442	$self->{vertical}	1666	$self->{vertical}
…		…
1475	$req[$_] += $space * $children[$_]{expand}	1699	$req[$_] += $space * $children[$_]{expand}
1476	for 0 .. $#children;	1700	for 0 .. $#children;
1477	}	1701	}
1478	}	1702	}
1479		1703
1480	CFClient::UI::harmonize \@req;	1704	CFPlus::UI::harmonize \@req;
1481		1705
1482	my $pos = 0;	1706	my $pos = 0;
1483	for (0 .. $#children) {	1707	for (0 .. $#children) {
1484	my $alloc = $req[$_];	1708	my $alloc = $req[$_];
1485	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1709	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1490	1	1714	1
1491	}	1715	}
1492		1716
1493	#############################################################################	1717	#############################################################################
1494		1718
1495	package CFClient::UI::HBox;	1719	package CFPlus::UI::HBox;
1496		1720
1497	our @ISA = CFClient::UI::Box::;	1721	our @ISA = CFPlus::UI::Box::;
1498		1722
1499	sub new {	1723	sub new {
1500	my $class = shift;	1724	my $class = shift;
1501		1725
1502	$class->SUPER::new (	1726	$class->SUPER::new (
…		…
1505	)	1729	)
1506	}	1730	}
1507		1731
1508	#############################################################################	1732	#############################################################################
1509		1733
1510	package CFClient::UI::VBox;	1734	package CFPlus::UI::VBox;
1511		1735
1512	our @ISA = CFClient::UI::Box::;	1736	our @ISA = CFPlus::UI::Box::;
1513		1737
1514	sub new {	1738	sub new {
1515	my $class = shift;	1739	my $class = shift;
1516		1740
1517	$class->SUPER::new (	1741	$class->SUPER::new (
…		…
1520	)	1744	)
1521	}	1745	}
1522		1746
1523	#############################################################################	1747	#############################################################################
1524		1748
1525	package CFClient::UI::Label;	1749	package CFPlus::UI::Label;
1526		1750
1527	our @ISA = CFClient::UI::DrawBG::;	1751	our @ISA = CFPlus::UI::DrawBG::;
1528		1752
1529	use CFClient::OpenGL;	1753	use CFPlus::OpenGL;
1530		1754
1531	sub new {	1755	sub new {
1532	my ($class, %arg) = @_;	1756	my ($class, %arg) = @_;
1533		1757
1534	my $self = $class->SUPER::new (	1758	my $self = $class->SUPER::new (
…		…
1537	#active_bg => none	1761	#active_bg => none
1538	#font => default_font	1762	#font => default_font
1539	#text => initial text	1763	#text => initial text
1540	#markup => initial narkup	1764	#markup => initial narkup
1541	#max_w => maximum pixel width	1765	#max_w => maximum pixel width
		1766	#style => 0, # render flags
1542	ellipsise => 3, # end	1767	ellipsise => 3, # end
1543	layout => (new CFClient::Layout),	1768	layout => (new CFPlus::Layout),
1544	fontsize => 1,	1769	fontsize => 1,
1545	align => -1,	1770	align => -1,
1546	valign => -1,	1771	valign => -1,
1547	padding_x => 2,	1772	padding_x => 2,
1548	padding_y => 2,	1773	padding_y => 2,
1549	can_events => 0,	1774	can_events => 0,
1550	%arg	1775	%arg
1551	);	1776	);
1552		1777
1553	if (exists $self->{template}) {	1778	if (exists $self->{template}) {
1554	my $layout = new CFClient::Layout;	1779	my $layout = new CFPlus::Layout;
1555	$layout->set_text (delete $self->{template});	1780	$layout->set_text (delete $self->{template});
1556	$self->{template} = $layout;	1781	$self->{template} = $layout;
1557	}	1782	}
1558		1783
1559	if (exists $self->{markup}) {	1784	if (exists $self->{markup}) {
…		…
1561	} else {	1786	} else {
1562	$self->set_text (delete $self->{text});	1787	$self->set_text (delete $self->{text});
1563	}	1788	}
1564		1789
1565	$self	1790	$self
1566	}
1567
1568	sub escape($) {
1569	local $_ = $_[0];
1570
1571	s/&/&amp;/g;
1572	s/>/&gt;/g;
1573	s/</&lt;/g;
1574
1575	$_
1576	}	1791	}
1577		1792
1578	sub update {	1793	sub update {
1579	my ($self) = @_;	1794	my ($self) = @_;
1580		1795
…		…
1707	};	1922	};
1708		1923
1709	my $w = List::Util::min $self->{w} + 4, $size->[0];	1924	my $w = List::Util::min $self->{w} + 4, $size->[0];
1710	my $h = List::Util::min $self->{h} + 2, $size->[1];	1925	my $h = List::Util::min $self->{h} + 2, $size->[1];
1711		1926
1712	$self->{layout}->render ($self->{ox}, $self->{oy});	1927	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713	}	1928	}
1714		1929
1715	#############################################################################	1930	#############################################################################
1716		1931
1717	package CFClient::UI::EntryBase;	1932	package CFPlus::UI::EntryBase;
1718		1933
1719	our @ISA = CFClient::UI::Label::;	1934	our @ISA = CFPlus::UI::Label::;
1720		1935
1721	use CFClient::OpenGL;	1936	use CFPlus::OpenGL;
1722		1937
1723	sub new {	1938	sub new {
1724	my $class = shift;	1939	my $class = shift;
1725		1940
1726	$class->SUPER::new (	1941	$class->SUPER::new (
…		…
1730	active_fg => [0, 0, 0],	1945	active_fg => [0, 0, 0],
1731	can_hover => 1,	1946	can_hover => 1,
1732	can_focus => 1,	1947	can_focus => 1,
1733	valign => 0,	1948	valign => 0,
1734	can_events => 1,	1949	can_events => 1,
		1950	ellipsise => 0,
1735	#text => ...	1951	#text => ...
1736	#hidden => "*",	1952	#hidden => "*",
1737	@_	1953	@_
1738	)	1954	)
1739	}	1955	}
…		…
1784	my $sym = $ev->{sym};	2000	my $sym = $ev->{sym};
1785	my $uni = $ev->{unicode};	2001	my $uni = $ev->{unicode};
1786		2002
1787	my $text = $self->get_text;	2003	my $text = $self->get_text;
1788		2004
		2005	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2006
1789	if ($uni == 8) {	2007	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2008	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	2009	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	2010	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	2011	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	2012	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	2013	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	2014	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} elsif ($sym == CFClient::SDLK_HOME) {	2015	} elsif ($sym == CFPlus::SDLK_HOME) {
		2016	# what a hack
		2017	$self->{cursor} =
		2018	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2019	? length $1
		2020	: 0;
		2021	} elsif ($sym == CFPlus::SDLK_END) {
		2022	# uh, again
		2023	$self->{cursor} =
		2024	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2025	? $self->{cursor} + length $1
		2026	: length $self->{text};
		2027	} elsif ($uni == 21) { # ctrl-u
		2028	$text = "";
1798	$self->{cursor} = 0;	2029	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {
1800	$self->{cursor} = length $text;
1801	} elsif ($uni == 27) {	2030	} elsif ($uni == 27) {
1802	$self->emit ('escape');	2031	$self->emit ('escape');
1803	} elsif ($uni) {	2032	} elsif ($uni == 0x0d) {
		2033	substr $text, $self->{cursor}++, 0, "\012";
		2034	} elsif ($uni >= 0x20) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	2035	substr $text, $self->{cursor}++, 0, chr $uni;
1805	} else {	2036	} else {
1806	return 0;	2037	return 0;
1807	}	2038	}
1808		2039
1809	$self->_set_text ($text);	2040	$self->_set_text ($text);
1810		2041
1811	$self->realloc;	2042	$self->realloc;
		2043	$self->update;
1812		2044
1813	1	2045	1
1814	}	2046	}
1815		2047
1816	sub invoke_focus_in {	2048	sub invoke_focus_in {
…		…
1878	utf8::encode $text;	2110	utf8::encode $text;
1879		2111
1880	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2112	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881	}	2113	}
1882		2114
1883	glColor @{$self->{fg}};
1884	glBegin GL_LINES;	2115	glBegin GL_LINES;
1885	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2116	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};	2117	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887	glEnd;	2118	glEnd;
1888	}	2119	}
1889	}	2120	}
1890		2121
		2122	#############################################################################
		2123
1891	package CFClient::UI::Entry;	2124	package CFPlus::UI::Entry;
1892		2125
1893	our @ISA = CFClient::UI::EntryBase::;	2126	our @ISA = CFPlus::UI::EntryBase::;
1894		2127
1895	use CFClient::OpenGL;	2128	use CFPlus::OpenGL;
1896		2129
1897	sub invoke_key_down {	2130	sub invoke_key_down {
1898	my ($self, $ev) = @_;	2131	my ($self, $ev) = @_;
1899		2132
1900	my $sym = $ev->{sym};	2133	my $sym = $ev->{sym};
1901		2134
1902	if ($sym == 13) {	2135	if ($ev->{uni} == 0x0d || $sym == 13) {
1903	unshift @{$self->{history}},	2136	unshift @{$self->{history}},
1904	my $txt = $self->get_text;	2137	my $txt = $self->get_text;
1905		2138
1906	$self->{history_pointer} = -1;	2139	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	2140	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	2141	$self->emit (activate => $txt);
1909	$self->update;	2142	$self->update;
1910		2143
1911	} elsif ($sym == CFClient::SDLK_UP) {	2144	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	2145	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	2146	$self->{history_saveback} = $self->get_text;
1914	}	2147	}
1915	if (@{$self->{history} || []} > 0) {	2148	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	2149	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	2151	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	2152	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2153	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	2154	}
1922		2155
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	2156	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	2157	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2158	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		2159
1927	if ($self->{history_pointer} >= 0) {	2160	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2161	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2170	1
1938	}	2171	}
1939		2172
1940	#############################################################################	2173	#############################################################################
1941		2174
		2175	package CFPlus::UI::TextEdit;
		2176
		2177	our @ISA = CFPlus::UI::EntryBase::;
		2178
		2179	use CFPlus::OpenGL;
		2180
		2181	sub move_cursor_ver {
		2182	my ($self, $dy) = @_;
		2183
		2184	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2185
		2186	$y += $dy;
		2187
		2188	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2189	$self->{cursor} = $index;
		2190	delete $self->{cur_h};
		2191	$self->update;
		2192	return;
		2193	}
		2194	}
		2195
		2196	sub invoke_key_down {
		2197	my ($self, $ev) = @_;
		2198
		2199	my $sym = $ev->{sym};
		2200
		2201	if ($sym == CFPlus::SDLK_UP) {
		2202	$self->move_cursor_ver (-1);
		2203	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2204	$self->move_cursor_ver (+1);
		2205	} else {
		2206	return $self->SUPER::invoke_key_down ($ev)
		2207	}
		2208
		2209	1
		2210	}
		2211
		2212	#############################################################################
		2213
1942	package CFClient::UI::Button;	2214	package CFPlus::UI::Button;
1943		2215
1944	our @ISA = CFClient::UI::Label::;	2216	our @ISA = CFPlus::UI::Label::;
1945		2217
1946	use CFClient::OpenGL;	2218	use CFPlus::OpenGL;
1947		2219
1948	my @tex =	2220	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2221	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2222	qw(b1_button_active.png);
1951		2223
1952	sub new {	2224	sub new {
1953	my $class = shift;	2225	my $class = shift;
1954		2226
…		…
1991	$self->SUPER::_draw;	2263	$self->SUPER::_draw;
1992	}	2264	}
1993		2265
1994	#############################################################################	2266	#############################################################################
1995		2267
		2268	package CFPlus::UI::CheckBox;
		2269
		2270	our @ISA = CFPlus::UI::DrawBG::;
		2271
		2272	my @tex =
		2273	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2274	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2275
		2276	use CFPlus::OpenGL;
		2277
		2278	sub new {
		2279	my $class = shift;
		2280
		2281	$class->SUPER::new (
		2282	padding_x => 2,
		2283	padding_y => 2,
		2284	fg => [1, 1, 1],
		2285	active_fg => [1, 1, 0],
		2286	bg => [0, 0, 0, 0.2],
		2287	active_bg => [1, 1, 1, 0.5],
		2288	state => 0,
		2289	can_hover => 1,
		2290	@_
		2291	)
		2292	}
		2293
		2294	sub size_request {
		2295	my ($self) = @_;
		2296
		2297	(6) x 2
		2298	}
		2299
		2300	sub toggle {
		2301	my ($self) = @_;
		2302
		2303	$self->{state} = !$self->{state};
		2304	$self->emit (changed => $self->{state});
		2305	$self->update;
		2306	}
		2307
		2308	sub invoke_button_down {
		2309	my ($self, $ev, $x, $y) = @_;
		2310
		2311	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2312	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2313	$self->toggle;
		2314	} else {
		2315	return 0
		2316	}
		2317
		2318	1
		2319	}
		2320
		2321	sub _draw {
		2322	my ($self) = @_;
		2323
		2324	$self->SUPER::_draw;
		2325
		2326	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2327
		2328	my ($w, $h) = @$self{qw(w h)};
		2329
		2330	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2331
		2332	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2333
		2334	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2335
		2336	glEnable GL_TEXTURE_2D;
		2337	$tex->draw_quad_alpha (0, 0, $s, $s);
		2338	glDisable GL_TEXTURE_2D;
		2339	}
		2340
		2341	#############################################################################
		2342
		2343	package CFPlus::UI::Image;
		2344
		2345	our @ISA = CFPlus::UI::Base::;
		2346
		2347	use CFPlus::OpenGL;
		2348
		2349	our %texture_cache;
		2350
		2351	sub new {
		2352	my $class = shift;
		2353
		2354	my $self = $class->SUPER::new (
		2355	can_events => 0,
		2356	@_,
		2357	);
		2358
		2359	$self->{path} || $self->{tex}
		2360	or Carp::croak "'path' or 'tex' attributes required";
		2361
		2362	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2363	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2364
		2365	CFPlus::weaken $texture_cache{$self->{path}};
		2366
		2367	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2368
		2369	$self
		2370	}
		2371
		2372	sub STORABLE_freeze {
		2373	my ($self, $cloning) = @_;
		2374
		2375	$self->{path}
		2376	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2377
		2378	$self->{path}
		2379	}
		2380
		2381	sub STORABLE_attach {
		2382	my ($self, $cloning, $path) = @_;
		2383
		2384	$self->new (path => $path)
		2385	}
		2386
		2387	sub size_request {
		2388	my ($self) = @_;
		2389
		2390	($self->{tex}{w}, $self->{tex}{h})
		2391	}
		2392
		2393	sub _draw {
		2394	my ($self) = @_;
		2395
		2396	my $tex = $self->{tex};
		2397
		2398	my ($w, $h) = ($self->{w}, $self->{h});
		2399
		2400	if ($self->{rot90}) {
		2401	glRotate 90, 0, 0, 1;
		2402	glTranslate 0, -$self->{w}, 0;
		2403
		2404	($w, $h) = ($h, $w);
		2405	}
		2406
		2407	glEnable GL_TEXTURE_2D;
		2408	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2409
		2410	$tex->draw_quad (0, 0, $w, $h);
		2411
		2412	glDisable GL_TEXTURE_2D;
		2413	}
		2414
		2415	#############################################################################
		2416
1996	package CFClient::UI::ImageButton;	2417	package CFPlus::UI::ImageButton;
1997		2418
1998	our @ISA = CFClient::UI::Image::;	2419	our @ISA = CFPlus::UI::Image::;
1999		2420
2000	use CFClient::OpenGL;	2421	use CFPlus::OpenGL;
2001		2422
2002	my %textures;	2423	my %textures;
2003		2424
2004	sub new {	2425	sub new {
2005	my $class = shift;	2426	my $class = shift;
…		…
2027	1	2448	1
2028	}	2449	}
2029		2450
2030	#############################################################################	2451	#############################################################################
2031		2452
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 toggle {
2065	my ($self) = @_;
2066
2067	$self->{state} = !$self->{state};
2068	$self->emit (changed => $self->{state});
2069	$self->update;
2070	}
2071
2072	sub invoke_button_down {
2073	my ($self, $ev, $x, $y) = @_;
2074
2075	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2076	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2077	$self->toggle;
2078	} else {
2079	return 0
2080	}
2081
2082	1
2083	}
2084
2085	sub _draw {
2086	my ($self) = @_;
2087
2088	$self->SUPER::_draw;
2089
2090	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2091
2092	my ($w, $h) = @$self{qw(w h)};
2093
2094	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2095
2096	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2097
2098	my $tex = $self->{state} ? $tex[1] : $tex[0];
2099
2100	glEnable GL_TEXTURE_2D;
2101	$tex->draw_quad_alpha (0, 0, $s, $s);
2102	glDisable GL_TEXTURE_2D;
2103	}
2104
2105	#############################################################################
2106
2107	package CFClient::UI::Image;	2453	package CFPlus::UI::VGauge;
2108		2454
2109	our @ISA = CFClient::UI::Base::;	2455	our @ISA = CFPlus::UI::Base::;
2110
2111	use CFClient::OpenGL;
2112
2113	our %texture_cache;
2114
2115	sub new {
2116	my $class = shift;
2117
2118	my $self = $class->SUPER::new (
2119	can_events => 0,
2120	@_,
2121	);
2122
2123	$self->{path}
2124	or Carp::croak "required attribute 'path' not set";
2125
2126	$self->{tex} = $texture_cache{$self->{path}} ||=
2127	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2128
2129	Scalar::Util::weaken $texture_cache{$self->{path}};
2130
2131	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2132
2133	$self
2134	}
2135
2136	sub size_request {
2137	my ($self) = @_;
2138
2139	($self->{tex}{w}, $self->{tex}{h})
2140	}
2141
2142	sub _draw {
2143	my ($self) = @_;
2144
2145	my $tex = $self->{tex};
2146
2147	my ($w, $h) = ($self->{w}, $self->{h});
2148
2149	if ($self->{rot90}) {
2150	glRotate 90, 0, 0, 1;
2151	glTranslate 0, -$self->{w}, 0;
2152
2153	($w, $h) = ($h, $w);
2154	}
2155
2156	glEnable GL_TEXTURE_2D;
2157	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158
2159	$tex->draw_quad_alpha (0, 0, $w, $h);
2160
2161	glDisable GL_TEXTURE_2D;
2162	}
2163
2164	#############################################################################
2165
2166	package CFClient::UI::VGauge;
2167
2168	our @ISA = CFClient::UI::Base::;
2169		2456
2170	use List::Util qw(min max);	2457	use List::Util qw(min max);
2171		2458
2172	use CFClient::OpenGL;	2459	use CFPlus::OpenGL;
2173		2460
2174	my %tex = (	2461	my %tex = (
2175	food => [	2462	food => [
2176	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2463	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2177	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2464	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2178	],	2465	],
2179	grace => [	2466	grace => [
2180	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2467	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2181	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2468	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2182	],	2469	],
2183	hp => [	2470	hp => [
2184	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2471	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2185	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2472	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2186	],	2473	],
2187	mana => [	2474	mana => [
2188	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2475	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2476	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2190	],	2477	],
2191	);	2478	);
2192		2479
2193	# eg. VGauge->new (gauge => 'food'), default gauge: food	2480	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2296	glDisable GL_TEXTURE_2D;	2583	glDisable GL_TEXTURE_2D;
2297	}	2584	}
2298		2585
2299	#############################################################################	2586	#############################################################################
2300		2587
2301	package CFClient::UI::Gauge;	2588	package CFPlus::UI::Gauge;
2302		2589
2303	our @ISA = CFClient::UI::VBox::;	2590	our @ISA = CFPlus::UI::VBox::;
2304		2591
2305	sub new {	2592	sub new {
2306	my ($class, %arg) = @_;	2593	my ($class, %arg) = @_;
2307		2594
2308	my $self = $class->SUPER::new (	2595	my $self = $class->SUPER::new (
…		…
2310	can_hover => 1,	2597	can_hover => 1,
2311	can_events => 1,	2598	can_events => 1,
2312	%arg,	2599	%arg,
2313	);	2600	);
2314		2601
2315	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2602	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2316	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2603	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2317	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2604	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2318		2605
2319	$self	2606	$self
2320	}	2607	}
2321		2608
2322	sub set_fontsize {	2609	sub set_fontsize {
…		…
2343	$self->{value}->set_text ($val);	2630	$self->{value}->set_text ($val);
2344	}	2631	}
2345		2632
2346	#############################################################################	2633	#############################################################################
2347		2634
2348	package CFClient::UI::Slider;	2635	package CFPlus::UI::Slider;
2349		2636
2350	use strict;	2637	use strict;
2351		2638
2352	use CFClient::OpenGL;	2639	use CFPlus::OpenGL;
2353		2640
2354	our @ISA = CFClient::UI::DrawBG::;	2641	our @ISA = CFPlus::UI::DrawBG::;
2355		2642
2356	my @tex =	2643	my @tex =
2357	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2644	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2358	qw(s1_slider.png s1_slider_bg.png);	2645	qw(s1_slider.png s1_slider_bg.png);
2359		2646
2360	sub new {	2647	sub new {
2361	my $class = shift;	2648	my $class = shift;
2362		2649
…		…
2451	}	2738	}
2452		2739
2453	1	2740	1
2454	}	2741	}
2455		2742
		2743	sub invoke_mouse_wheel {
		2744	my ($self, $ev) = @_;
		2745
		2746	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2747
		2748	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2749
		2750	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2751
		2752	! ! $delta
		2753	}
		2754
2456	sub update {	2755	sub update {
2457	my ($self) = @_;	2756	my ($self) = @_;
2458		2757
2459	delete $self->{knob_w};	2758	delete $self->{knob_w};
2460	$self->SUPER::update;	2759	$self->SUPER::update;
…		…
2507	glDisable GL_TEXTURE_2D;	2806	glDisable GL_TEXTURE_2D;
2508	}	2807	}
2509		2808
2510	#############################################################################	2809	#############################################################################
2511		2810
2512	package CFClient::UI::ValSlider;	2811	package CFPlus::UI::ValSlider;
2513		2812
2514	our @ISA = CFClient::UI::HBox::;	2813	our @ISA = CFPlus::UI::HBox::;
2515		2814
2516	sub new {	2815	sub new {
2517	my ($class, %arg) = @_;	2816	my ($class, %arg) = @_;
2518		2817
2519	my $range = delete $arg{range};	2818	my $range = delete $arg{range};
2520		2819
2521	my $self = $class->SUPER::new (	2820	my $self = $class->SUPER::new (
2522	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2821	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2523	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2822	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2524	to_value => sub { shift },	2823	to_value => sub { shift },
2525	from_value => sub { shift },	2824	from_value => sub { shift },
2526	%arg,	2825	%arg,
2527	);	2826	);
2528		2827
…		…
2548	sub set_range { shift->{slider}->set_range (@_) }	2847	sub set_range { shift->{slider}->set_range (@_) }
2549	sub set_value { shift->{slider}->set_value (@_) }	2848	sub set_value { shift->{slider}->set_value (@_) }
2550		2849
2551	#############################################################################	2850	#############################################################################
2552		2851
2553	package CFClient::UI::TextScroller;	2852	package CFPlus::UI::TextScroller;
2554		2853
2555	our @ISA = CFClient::UI::HBox::;	2854	our @ISA = CFPlus::UI::HBox::;
2556		2855
2557	use CFClient::OpenGL;	2856	use CFPlus::OpenGL;
2558		2857
2559	sub new {	2858	sub new {
2560	my $class = shift;	2859	my $class = shift;
2561		2860
2562	my $self = $class->SUPER::new (	2861	my $self = $class->SUPER::new (
2563	fontsize => 1,	2862	fontsize => 1,
2564	can_events => 0,	2863	can_events => 1,
2565	indent => 0,	2864	indent => 0,
2566	#font => default_font	2865	#font => default_font
2567	@_,	2866	@_,
2568		2867
2569	layout => (new CFClient::Layout),	2868	layout => (new CFPlus::Layout),
2570	par => [],	2869	par => [],
		2870	max_par => 0,
2571	height => 0,	2871	height => 0,
2572	children => [	2872	children => [
2573	(new CFClient::UI::Empty expand => 1),	2873	(new CFPlus::UI::Empty expand => 1),
2574	(new CFClient::UI::Slider vertical => 1),	2874	(new CFPlus::UI::Slider vertical => 1),
2575	],	2875	],
2576	);	2876	);
2577		2877
2578	$self->{children}[1]->connect (changed => sub { $self->update });	2878	$self->{children}[1]->connect (changed => sub { $self->update });
2579		2879
…		…
2609		2909
2610	$self->reflow;	2910	$self->reflow;
2611		2911
2612	local $self->{children} = [$empty, $slider];	2912	local $self->{children} = [$empty, $slider];
2613	$self->SUPER::invoke_size_allocate ($w, $h)	2913	$self->SUPER::invoke_size_allocate ($w, $h)
		2914	}
		2915
		2916	sub invoke_mouse_wheel {
		2917	my ($self, $ev) = @_;
		2918
		2919	return 0 unless $ev->{dy}; # only vertical movements
		2920
		2921	$self->{children}[1]->emit (mouse_wheel => $ev);
		2922
		2923	1
2614	}	2924	}
2615		2925
2616	sub get_layout {	2926	sub get_layout {
2617	my ($self, $para) = @_;	2927	my ($self, $para) = @_;
2618		2928
…		…
2646		2956
2647	# todo: base offset on lines or so, not on pixels	2957	# todo: base offset on lines or so, not on pixels
2648	$self->{children}[1]->set_value ($offset);	2958	$self->{children}[1]->set_value ($offset);
2649	}	2959	}
2650		2960
		2961	sub current_paragraph {
		2962	my ($self) = @_;
		2963
		2964	$self->{top_paragraph} - 1
		2965	}
		2966
		2967	sub scroll_to {
		2968	my ($self, $para) = @_;
		2969
		2970	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2971
		2972	$self->{scroll_to} = $para;
		2973	$self->update;
		2974	}
		2975
2651	sub clear {	2976	sub clear {
2652	my ($self) = @_;	2977	my ($self) = @_;
2653		2978
2654	my (undef, undef, @other) = @{ $self->{children} };	2979	my (undef, undef, @other) = @{ $self->{children} };
2655	$self->remove ($_) for @other;	2980	$self->remove ($_) for @other;
…		…
2658	$self->{height} = 0;	2983	$self->{height} = 0;
2659	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2984	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2660	}	2985	}
2661		2986
2662	sub add_paragraph {	2987	sub add_paragraph {
2663	my ($self, $color, $para, $indent) = @_;	2988	my $self = shift;
2664		2989
2665	my ($text, @w) = ref $para ? @$para : $para;	2990	for my $para (@_) {
2666
2667	$para = {	2991	$para = {
		2992	fg => [1, 1, 1, 1],
		2993	indent => 0,
		2994	markup => "",
		2995	widget => [],
		2996	ref $para ? %$para : (markup => $para),
2668	w => 1e10,	2997	w => 1e10,
2669	wrapped => 1,	2998	wrapped => 1,
2670	fg => $color,
2671	indent => $indent,
2672	markup => $text,
2673	widget => \@w,
2674	};	2999	};
2675		3000
2676	$self->add (@w) if @w;	3001	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2677	push @{$self->{par}}, $para;	3002	push @{$self->{par}}, $para;
		3003	}
		3004
		3005	if (my $max = $self->{max_par}) {
		3006	shift @{$self->{par}} while @{$self->{par}} > $max;
		3007	}
2678		3008
2679	$self->{need_reflow}++;	3009	$self->{need_reflow}++;
2680	$self->update;	3010	$self->update;
2681	}	3011	}
2682		3012
2683	sub scroll_to_bottom {	3013	sub scroll_to_bottom {
2684	my ($self) = @_;	3014	my ($self) = @_;
2685		3015
2686	$self->{scroll_to_bottom} = 1;	3016	$self->{scroll_to} = $#{$self->{par}};
2687	$self->update;	3017	$self->update;
2688	}	3018	}
2689		3019
		3020	sub force_uptodate {
		3021	my ($self) = @_;
		3022
		3023	if (delete $self->{need_reflow}) {
		3024	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3025
		3026	my $height = 0;
		3027
		3028	for my $para (@{$self->{par}}) {
		3029	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3030	my $layout = $self->get_layout ($para);
		3031	my ($w, $h) = $layout->size;
		3032
		3033	$para->{w} = $w + $para->{indent};
		3034	$para->{h} = $h;
		3035	$para->{wrapped} = $layout->has_wrapped;
		3036	}
		3037
		3038	$para->{y} = $height;
		3039	$height += $para->{h};
		3040	}
		3041
		3042	$self->{height} = $height;
		3043	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3044
		3045	delete $self->{texture};
		3046	}
		3047
		3048	if (my $paridx = delete $self->{scroll_to}) {
		3049	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3050	}
		3051	}
		3052
2690	sub update {	3053	sub update {
2691	my ($self) = @_;	3054	my ($self) = @_;
2692		3055
2693	$self->SUPER::update;	3056	$self->SUPER::update;
2694		3057
2695	return unless $self->{h} > 0;	3058	return unless $self->{h} > 0;
2696		3059
2697	delete $self->{texture};	3060	delete $self->{texture};
2698		3061
2699	$ROOT->on_post_alloc ($self => sub {	3062	$ROOT->on_post_alloc ($self => sub {
		3063	$self->force_uptodate;
		3064
2700	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3065	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2701		3066
2702	if (delete $self->{need_reflow}) {
2703	my $height = 0;
2704
2705	for my $para (@{$self->{par}}) {
2706	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2707	my $layout = $self->get_layout ($para);
2708	my ($w, $h) = $layout->size;
2709
2710	$para->{w} = $w + $para->{indent};
2711	$para->{h} = $h;
2712	$para->{wrapped} = $layout->has_wrapped;
2713	}
2714
2715	$height += $para->{h};
2716	}
2717
2718	$self->{height} = $height;
2719
2720	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2721
2722	delete $self->{texture};
2723	}
2724
2725	if (delete $self->{scroll_to_bottom}) {
2726	$self->{children}[1]->set_value (1e10);
2727	}
2728
2729	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3067	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2730	glClearColor 0, 0, 0, 0;	3068	glClearColor 0, 0, 0, 0;
2731	glClear GL_COLOR_BUFFER_BIT;	3069	glClear GL_COLOR_BUFFER_BIT;
2732		3070
		3071	package CFPlus::UI::Base;
		3072	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3073	(0, 0, $self->{w}, $self->{h});
		3074
		3075	my $top = int $self->{children}[1]{range}[0];
		3076
		3077	my $paridx = 0;
		3078	my $top_paragraph;
2733	my $top = int $self->{children}[1]{range}[0];	3079	my $top = int $self->{children}[1]{range}[0];
2734		3080
2735	my $y0 = $top;	3081	my $y0 = $top;
2736	my $y1 = $top + $H;	3082	my $y1 = $top + $H;
2737		3083
2738	my $y = 0;
2739
2740	for my $para (@{$self->{par}}) {	3084	for my $para (@{$self->{par}}) {
2741	my $h = $para->{h};	3085	my $h = $para->{h};
		3086	my $y = $para->{y};
2742		3087
2743	if ($y0 < $y + $h && $y < $y1) {	3088	if ($y0 < $y + $h && $y < $y1) {
2744
2745	my $layout = $self->get_layout ($para);	3089	my $layout = $self->get_layout ($para);
2746		3090
2747	$layout->render ($para->{indent}, $y - $y0);	3091	$layout->render ($para->{indent}, $y - $y0);
2748		3092
2749	if (my @w = @{ $para->{widget} }) {	3093	if (my @w = @{ $para->{widget} }) {
…		…
2758	$_->draw;	3102	$_->draw;
2759	}	3103	}
2760	}	3104	}
2761	}	3105	}
2762		3106
2763	$y += $h;	3107	$paridx++;
		3108	$top_paragraph ||= $paridx if $y >= $top;
2764	}	3109	}
		3110
		3111	$self->{top_paragraph} = $top_paragraph;
2765	};	3112	};
2766	});	3113	});
2767	}	3114	}
2768		3115
2769	sub reconfigure {	3116	sub reconfigure {
…		…
2787	$self->{children}[1]->draw;	3134	$self->{children}[1]->draw;
2788	}	3135	}
2789		3136
2790	#############################################################################	3137	#############################################################################
2791		3138
2792	package CFClient::UI::Animator;	3139	package CFPlus::UI::Animator;
2793		3140
2794	use CFClient::OpenGL;	3141	use CFPlus::OpenGL;
2795		3142
2796	our @ISA = CFClient::UI::Bin::;	3143	our @ISA = CFPlus::UI::Bin::;
2797		3144
2798	sub moveto {	3145	sub moveto {
2799	my ($self, $x, $y) = @_;	3146	my ($self, $x, $y) = @_;
2800		3147
2801	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3148	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2829	glPopMatrix;	3176	glPopMatrix;
2830	}	3177	}
2831		3178
2832	#############################################################################	3179	#############################################################################
2833		3180
2834	package CFClient::UI::Flopper;	3181	package CFPlus::UI::Flopper;
2835		3182
2836	our @ISA = CFClient::UI::Button::;	3183	our @ISA = CFPlus::UI::Button::;
2837		3184
2838	sub new {	3185	sub new {
2839	my $class = shift;	3186	my $class = shift;
2840		3187
2841	my $self = $class->SUPER::new (	3188	my $self = $class->SUPER::new (
…		…
2853	$self->{other}->toggle_visibility;	3200	$self->{other}->toggle_visibility;
2854	}	3201	}
2855		3202
2856	#############################################################################	3203	#############################################################################
2857		3204
2858	package CFClient::UI::Tooltip;	3205	package CFPlus::UI::Tooltip;
2859		3206
2860	our @ISA = CFClient::UI::Bin::;	3207	our @ISA = CFPlus::UI::Bin::;
2861		3208
2862	use CFClient::OpenGL;	3209	use CFPlus::OpenGL;
2863		3210
2864	sub new {	3211	sub new {
2865	my $class = shift;	3212	my $class = shift;
2866		3213
2867	$class->SUPER::new (	3214	$class->SUPER::new (
…		…
2870	)	3217	)
2871	}	3218	}
2872		3219
2873	sub set_tooltip_from {	3220	sub set_tooltip_from {
2874	my ($self, $widget) = @_;	3221	my ($self, $widget) = @_;
		3222
		3223	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3224	if $widget->{tooltip} =~ /^#(.*)$/;
2875		3225
2876	my $tooltip = $widget->{tooltip};	3226	my $tooltip = $widget->{tooltip};
2877		3227
2878	if ($ENV{CFPLUS_DEBUG} & 2) {	3228	if ($ENV{CFPLUS_DEBUG} & 2) {
2879	$tooltip .= "\n\n" . (ref $widget) . "\n"	3229	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2883	}	3233	}
2884		3234
2885	$tooltip =~ s/^\n+//;	3235	$tooltip =~ s/^\n+//;
2886	$tooltip =~ s/\n+$//;	3236	$tooltip =~ s/\n+$//;
2887		3237
2888	$self->add (new CFClient::UI::Label	3238	$self->add (new CFPlus::UI::Label
2889	markup => $tooltip,	3239	markup => $tooltip,
2890	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3240	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891	fontsize => 0.8,	3241	fontsize => 0.8,
2892	fg => [0, 0, 0, 1],	3242	style => 1, # FLAG_INVERSE
2893	ellipsise => 0,	3243	ellipsise => 0,
2894	font => ($widget->{tooltip_font} || $::FONT_PROP),	3244	font => ($widget->{tooltip_font} || $::FONT_PROP),
2895	);	3245	);
2896	}	3246	}
2897		3247
…		…
2916		3266
2917	$self->{root}->on_post_alloc ("move_$self" => sub {	3267	$self->{root}->on_post_alloc ("move_$self" => sub {
2918	my $widget = $self->{owner}	3268	my $widget = $self->{owner}
2919	or return;	3269	or return;
2920		3270
		3271	if ($widget->{visible}) {
2921	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3272	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922		3273
2923	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3274	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924	if $x + $self->{w} > $self->{root}{w};	3275	if $x + $self->{w} > $self->{root}{w};
2925		3276
2926	$self->move_abs ($x, $y);	3277	$self->move_abs ($x, $y);
		3278	} else {
		3279	$self->hide;
		3280	}
2927	});	3281	});
2928	}	3282	}
2929		3283
2930	sub _draw {	3284	sub _draw {
2931	my ($self) = @_;	3285	my ($self) = @_;
…		…
2955	$self->SUPER::_draw;	3309	$self->SUPER::_draw;
2956	}	3310	}
2957		3311
2958	#############################################################################	3312	#############################################################################
2959		3313
2960	package CFClient::UI::Face;	3314	package CFPlus::UI::Face;
2961		3315
2962	our @ISA = CFClient::UI::Base::;	3316	our @ISA = CFPlus::UI::DrawBG::;
2963		3317
2964	use CFClient::OpenGL;	3318	use CFPlus::OpenGL;
2965		3319
2966	sub new {	3320	sub new {
2967	my $class = shift;	3321	my $class = shift;
2968		3322
2969	my $self = $class->SUPER::new (	3323	my $self = $class->SUPER::new (
…		…
2971	can_events => 0,	3325	can_events => 0,
2972	@_,	3326	@_,
2973	);	3327	);
2974		3328
2975	if ($self->{anim} && $self->{animspeed}) {	3329	if ($self->{anim} && $self->{animspeed}) {
2976	Scalar::Util::weaken (my $widget = $self);	3330	CFPlus::weaken (my $widget = $self);
2977		3331
2978	$self->{timer} = Event->timer (	3332	$self->{timer} = Event->timer (
2979	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3333	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2980	hard => 1,	3334	hard => 1,
2981	interval => $self->{animspeed},	3335	interval => $self->{animspeed},
…		…
3004	sub _draw {	3358	sub _draw {
3005	my ($self) = @_;	3359	my ($self) = @_;
3006		3360
3007	return unless $::CONN;	3361	return unless $::CONN;
3008		3362
		3363	$self->SUPER::_draw;
		3364
3009	my $face;	3365	my $face;
3010		3366
3011	if ($self->{frame}) {	3367	if ($self->{frame}) {
3012	my $anim = $::CONN->{anim}[$self->{anim}];	3368	my $anim = $::CONN->{anim}[$self->{anim}];
3013		3369
…		…
3035	$self->SUPER::destroy;	3391	$self->SUPER::destroy;
3036	}	3392	}
3037		3393
3038	#############################################################################	3394	#############################################################################
3039		3395
3040	package CFClient::UI::Buttonbar;	3396	package CFPlus::UI::Buttonbar;
3041		3397
3042	our @ISA = CFClient::UI::HBox::;	3398	our @ISA = CFPlus::UI::HBox::;
3043		3399
3044	# TODO: should actualyl wrap buttons and other goodies.	3400	# TODO: should actually wrap buttons and other goodies.
3045		3401
3046	#############################################################################	3402	#############################################################################
3047		3403
3048	package CFClient::UI::Menu;	3404	package CFPlus::UI::Menu;
3049		3405
3050	our @ISA = CFClient::UI::FancyFrame::;	3406	our @ISA = CFPlus::UI::Toplevel::;
3051		3407
3052	use CFClient::OpenGL;	3408	use CFPlus::OpenGL;
3053		3409
3054	sub new {	3410	sub new {
3055	my $class = shift;	3411	my $class = shift;
3056		3412
3057	my $self = $class->SUPER::new (	3413	my $self = $class->SUPER::new (
3058	items => [],	3414	items => [],
3059	z => 100,	3415	z => 100,
3060	@_,	3416	@_,
3061	);	3417	);
3062		3418
3063	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3419	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3064		3420
3065	for my $item (@{ $self->{items} }) {	3421	for my $item (@{ $self->{items} }) {
3066	my ($widget, $cb, $tooltip) = @$item;	3422	my ($widget, $cb, $tooltip) = @$item;
3067		3423
3068	# handle various types of items, only text for now	3424	# handle various types of items, only text for now
3069	if (!ref $widget) {	3425	if (!ref $widget) {
3070	if ($widget =~ /\t/) {	3426	if ($widget =~ /\t/) {
3071	my ($left, $right) = split /\t/, $widget, 2;	3427	my ($left, $right) = split /\t/, $widget, 2;
3072		3428
3073	$widget = new CFClient::UI::HBox	3429	$widget = new CFPlus::UI::HBox
3074	can_hover => 1,	3430	can_hover => 1,
3075	can_events => 1,	3431	can_events => 1,
3076	tooltip => $tooltip,	3432	tooltip => $tooltip,
3077	children => [	3433	children => [
3078	(new CFClient::UI::Label markup => $left, expand => 1),	3434	(new CFPlus::UI::Label markup => $left, expand => 1),
3079	(new CFClient::UI::Label markup => $right, align => +1),	3435	(new CFPlus::UI::Label markup => $right, align => +1),
3080	],	3436	],
3081	;	3437	;
3082		3438
3083	} else {	3439	} else {
3084	$widget = new CFClient::UI::Label	3440	$widget = new CFPlus::UI::Label
3085	can_hover => 1,	3441	can_hover => 1,
3086	can_events => 1,	3442	can_events => 1,
3087	markup => $widget,	3443	markup => $widget,
3088	tooltip => $tooltip;	3444	tooltip => $tooltip;
3089	}	3445	}
…		…
3137	1	3493	1
3138	}	3494	}
3139		3495
3140	#############################################################################	3496	#############################################################################
3141		3497
3142	package CFClient::UI::Multiplexer;	3498	package CFPlus::UI::Multiplexer;
3143		3499
3144	our @ISA = CFClient::UI::Container::;	3500	our @ISA = CFPlus::UI::Container::;
3145		3501
3146	sub new {	3502	sub new {
3147	my $class = shift;	3503	my $class = shift;
3148		3504
3149	my $self = $class->SUPER::new (	3505	my $self = $class->SUPER::new (
…		…
3210	$self->{current}->draw;	3566	$self->{current}->draw;
3211	}	3567	}
3212		3568
3213	#############################################################################	3569	#############################################################################
3214		3570
3215	package CFClient::UI::Notebook;	3571	package CFPlus::UI::Notebook;
3216		3572
3217	our @ISA = CFClient::UI::VBox::;	3573	our @ISA = CFPlus::UI::VBox::;
3218		3574
3219	sub new {	3575	sub new {
3220	my $class = shift;	3576	my $class = shift;
3221		3577
3222	my $self = $class->SUPER::new (	3578	my $self = $class->SUPER::new (
3223	buttonbar => (new CFClient::UI::Buttonbar),	3579	buttonbar => (new CFPlus::UI::Buttonbar),
3224	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3580	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3225	# filter => # will be put between multiplexer and $self	3581	# filter => # will be put between multiplexer and $self
3226	@_,	3582	@_,
3227	);	3583	);
3228		3584
3229	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3585	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3233	}	3589	}
3234		3590
3235	sub add {	3591	sub add {
3236	my ($self, $title, $widget, $tooltip) = @_;	3592	my ($self, $title, $widget, $tooltip) = @_;
3237		3593
3238	Scalar::Util::weaken $self;	3594	CFPlus::weaken $self;
3239		3595
3240	$self->{buttonbar}->add (new CFClient::UI::Button	3596	$self->{buttonbar}->add (new CFPlus::UI::Button
3241	markup => $title,	3597	markup => $title,
3242	tooltip => $tooltip,	3598	tooltip => $tooltip,
3243	on_activate => sub { $self->set_current_page ($widget) },	3599	on_activate => sub { $self->set_current_page ($widget) },
3244	);	3600	);
3245		3601
…		…
3259	$self->emit (page_changed => $self->{multiplexer}{current});	3615	$self->emit (page_changed => $self->{multiplexer}{current});
3260	}	3616	}
3261		3617
3262	#############################################################################	3618	#############################################################################
3263		3619
3264	package CFClient::UI::Combobox;	3620	package CFPlus::UI::Selector;
3265		3621
3266	use utf8;	3622	use utf8;
3267		3623
3268	our @ISA = CFClient::UI::Button::;	3624	our @ISA = CFPlus::UI::Button::;
3269		3625
3270	sub new {	3626	sub new {
3271	my $class = shift;	3627	my $class = shift;
3272		3628
3273	my $self = $class->SUPER::new (	3629	my $self = $class->SUPER::new (
…		…
3290	my ($value, $title, $tooltip) = @$_;	3646	my ($value, $title, $tooltip) = @$_;
3291		3647
3292	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3648	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3293	}	3649	}
3294		3650
3295	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3651	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3296	}	3652	}
3297		3653
3298	sub _set_value {	3654	sub _set_value {
3299	my ($self, $value) = @_;	3655	my ($self, $value) = @_;
3300		3656
…		…
3315	$self->emit (changed => $value);	3671	$self->emit (changed => $value);
3316	}	3672	}
3317		3673
3318	#############################################################################	3674	#############################################################################
3319		3675
3320	package CFClient::UI::Statusbox;	3676	package CFPlus::UI::Statusbox;
3321		3677
3322	our @ISA = CFClient::UI::VBox::;	3678	our @ISA = CFPlus::UI::VBox::;
3323		3679
3324	sub new {	3680	sub new {
3325	my $class = shift;	3681	my $class = shift;
3326		3682
3327	my $self = $class->SUPER::new (	3683	my $self = $class->SUPER::new (
3328	fontsize => 0.8,	3684	fontsize => 0.8,
3329	@_,	3685	@_,
3330	);	3686	);
3331		3687
3332	Scalar::Util::weaken (my $this = $self);	3688	CFPlus::weaken (my $this = $self);
3333		3689
3334	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3690	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3335		3691
3336	$self	3692	$self
3337	}	3693	}
…		…
3339	sub reorder {	3695	sub reorder {
3340	my ($self) = @_;	3696	my ($self) = @_;
3341	my $NOW = Time::HiRes::time;	3697	my $NOW = Time::HiRes::time;
3342		3698
3343	# freeze display when hovering over any label	3699	# freeze display when hovering over any label
3344	return if $CFClient::UI::TOOLTIP->{owner}	3700	return if $CFPlus::UI::TOOLTIP->{owner}
3345	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3701	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3346	values %{ $self->{item} };	3702	values %{ $self->{item} };
3347		3703
3348	while (my ($k, $v) = each %{ $self->{item} }) {	3704	while (my ($k, $v) = each %{ $self->{item} }) {
3349	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3705	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3350	}	3706	}
…		…
3371	for ($short) {	3727	for ($short) {
3372	s/^\s+//;	3728	s/^\s+//;
3373	s/\s+/ /g;	3729	s/\s+/ /g;
3374	}	3730	}
3375		3731
3376	new CFClient::UI::Label	3732	new CFPlus::UI::Label
3377	markup => $short,	3733	markup => $short,
3378	tooltip => $item->{tooltip},	3734	tooltip => $item->{tooltip},
3379	tooltip_font => $::FONT_PROP,	3735	tooltip_font => $::FONT_PROP,
3380	tooltip_width => 0.67,	3736	tooltip_width => 0.67,
3381	fontsize => $item->{fontsize} || $self->{fontsize},	3737	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3460	$self->SUPER::destroy;	3816	$self->SUPER::destroy;
3461	}	3817	}
3462		3818
3463	#############################################################################	3819	#############################################################################
3464		3820
3465	package CFClient::UI::Inventory;
3466
3467	our @ISA = CFClient::UI::Table::;
3468
3469	sub new {
3470	my $class = shift;
3471
3472	my $self = $class->SUPER::new (
3473	col_expand => [0, 1, 0],
3474	@_,
3475	);
3476
3477	$self
3478	}
3479
3480	sub set_items {
3481	my ($self, $items) = @_;
3482
3483	$self->clear;
3484	return unless $items;
3485
3486	my @items = sort {
3487	($a->{type} <=> $b->{type})
3488	or ($a->{name} cmp $b->{name})
3489	} values %$items;
3490
3491	$self->{real_items} = \@items;
3492
3493	my $row = 0;
3494	for my $item (@items) {
3495	CFClient::Item::update_widgets $item;
3496
3497	$self->add (0, $row, $item->{face_widget});
3498	$self->add (1, $row, $item->{desc_widget});
3499	$self->add (2, $row, $item->{weight_widget});
3500
3501	$row++;
3502	}
3503	}
3504
3505	#############################################################################
3506
3507	package CFClient::UI::SpellList;
3508
3509	our @ISA = CFClient::UI::Table::;
3510
3511	sub new {
3512	my $class = shift;
3513
3514	my $self = $class->SUPER::new (
3515	binding => [],
3516	commands => [],
3517	@_,
3518	)
3519	}
3520
3521	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3522
3523	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3524	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3525	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3526	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3527	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3528	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3529	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3530	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3531	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3532	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3533
3534	sub rebuild_spell_list {
3535	my ($self) = @_;
3536
3537	$CFClient::UI::ROOT->on_refresh ($self => sub {
3538	$self->clear;
3539
3540	return unless $::CONN;
3541
3542	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3543	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3544	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3545	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3546	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3547
3548	my $row = 0;
3549
3550	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3551	my $spell = $self->{spell}{$_};
3552
3553	$row++;
3554
3555	my $spell_cb = sub {
3556	my ($widget, $ev) = @_;
3557
3558	if ($ev->{button} == 1) {
3559	$::CONN->user_send ("cast $spell->{name}");
3560	} elsif ($ev->{button} == 2) {
3561	$::CONN->user_send ("invoke $spell->{name}");
3562	} elsif ($ev->{button} == 3) {
3563	(new CFClient::UI::Menu
3564	items => [
3565	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3566	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3567	],
3568	)->popup ($ev);
3569	} else {
3570	return 0;
3571	}
3572
3573	1
3574	};
3575
3576	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3577
3578	#TODO: add path info to tooltip
3579	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3580
3581	$self->add (0, $row, new CFClient::UI::Face
3582	face => $spell->{face},
3583	can_hover => 1,
3584	can_events => 1,
3585	tooltip => $tooltip,
3586	on_button_down => $spell_cb,
3587	);
3588
3589	$self->add (1, $row, new CFClient::UI::Label
3590	expand => 1,
3591	text => $spell->{name},
3592	can_hover => 1,
3593	can_events => 1,
3594	tooltip => $tooltip,
3595	on_button_down => $spell_cb,
3596	);
3597
3598	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3599	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3600	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3601	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3602	}
3603	});
3604	}
3605
3606	sub add_spell {
3607	my ($self, $spell) = @_;
3608
3609	$self->{spell}->{$spell->{name}} = $spell;
3610	$self->rebuild_spell_list;
3611	}
3612
3613	sub remove_spell {
3614	my ($self, $spell) = @_;
3615
3616	delete $self->{spell}->{$spell->{name}};
3617	$self->rebuild_spell_list;
3618	}
3619
3620	sub clear_spells {
3621	my ($self) = @_;
3622
3623	$self->{spell} = {};
3624	$self->rebuild_spell_list;
3625	}
3626
3627	#############################################################################
3628
3629	package CFClient::UI::Root;	3821	package CFPlus::UI::Root;
3630		3822
3631	our @ISA = CFClient::UI::Container::;	3823	our @ISA = CFPlus::UI::Container::;
3632		3824
3633	use List::Util qw(min max);	3825	use List::Util qw(min max);
3634		3826
3635	use CFClient::OpenGL;	3827	use CFPlus::OpenGL;
3636		3828
3637	sub new {	3829	sub new {
3638	my $class = shift;	3830	my $class = shift;
3639		3831
3640	my $self = $class->SUPER::new (	3832	my $self = $class->SUPER::new (
3641	visible => 1,	3833	visible => 1,
3642	@_,	3834	@_,
3643	);	3835	);
3644		3836
3645	Scalar::Util::weaken ($self->{root} = $self);	3837	CFPlus::weaken ($self->{root} = $self);
3646		3838
3647	$self	3839	$self
3648	}	3840	}
3649		3841
3650	sub size_request {	3842	sub size_request {
…		…
3819	$h = 0 if $h < 0;	4011	$h = 0 if $h < 0;
3820		4012
3821	$w = max $widget->{min_w}, $w;	4013	$w = max $widget->{min_w}, $w;
3822	$h = max $widget->{min_h}, $h;	4014	$h = max $widget->{min_h}, $h;
3823		4015
		4016	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4017	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4018
3824	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4019	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3825	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4020	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3826		4021
3827	$w = int $w + 0.5;	4022	$w = int $w + 0.5;
3828	$h = int $h + 0.5;	4023	$h = int $h + 0.5;
…		…
3854	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4049	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3855	glMatrixMode GL_MODELVIEW;	4050	glMatrixMode GL_MODELVIEW;
3856	glLoadIdentity;	4051	glLoadIdentity;
3857		4052
3858	{	4053	{
3859	package CFClient::UI::Base;	4054	package CFPlus::UI::Base;
3860		4055
3861	($draw_x, $draw_y, $draw_w, $draw_h) =	4056	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3862	(0, 0, $self->{w}, $self->{h});	4057	(0, 0, $self->{w}, $self->{h});
3863	}
3864		4058
3865	$self->_draw;	4059	$self->_draw;
		4060	}
3866	}	4061	}
3867		4062
3868	#############################################################################	4063	#############################################################################
3869		4064
3870	package CFClient::UI;	4065	package CFPlus::UI;
3871		4066
3872	$ROOT = new CFClient::UI::Root;	4067	$ROOT = new CFPlus::UI::Root;
3873	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4068	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3874		4069
3875	1	4070	1
3876		4071

Diff Legend

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