ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.328 by root, Sat Jul 22 13:43:05 2006 UTC vs.
Revision 1.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	warn "button down $ev->{button}\n";#d#	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
89		105
90	if (!$BUTTON_STATE) {	106	unless ($GRAB) {
91	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
92		108
93	$GRAB = $widget;	109	$GRAB = $widget;
94	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
95		111
96	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
97	}	113	}
98		114
99	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
100		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
101	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	# mousewheel
102	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	}
103	}	125	}
104		126
105	sub feed_sdl_button_up_event {	127	sub feed_sdl_button_up_event {
106	my ($ev) = @_;	128	my ($ev) = @_;
107	my ($x, $y) = ($ev->{x}, $ev->{y});
108		129
109	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	130	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
110		131
111	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	132	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
112		133
113	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	134	$GRAB->emit (button_up => $ev)
114	if $GRAB;	135	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
115		136
116	if (!$BUTTON_STATE) {	137	unless ($BUTTON_STATE) {
117	my $grab = $GRAB; undef $GRAB;	138	my $grab = $GRAB; undef $GRAB;
118	$grab->update if $grab;	139	$grab->update if $grab;
119	$GRAB->update if $GRAB;	140	$GRAB->update if $GRAB;
120		141
		142	check_hover $widget;
121	$TOOLTIP_WATCHER->cb->();	143	$TOOLTIP_WATCHER->cb->();
122	}	144	}
123	}	145	}
124		146
125	sub feed_sdl_motion_event {	147	sub feed_sdl_motion_event {
126	my ($ev) = @_;	148	my ($ev) = @_;
127	my ($x, $y) = ($ev->{x}, $ev->{y});	149	my ($x, $y) = ($ev->{x}, $ev->{y});
128		150
129	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	151	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
130		152
131	if ($widget != $HOVER) {	153	check_hover $widget;
132	my $hover = $HOVER; $HOVER = $widget;
133		154
134	$hover->update if $hover && $hover->{can_hover};	155	$HOVER->emit (mouse_motion => $ev)
135	$HOVER->update if $HOVER && $HOVER->{can_hover};
136
137	$TOOLTIP_WATCHER->start;
138	}
139
140	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
141	if $HOVER;	156	if $HOVER;
142	}	157	}
143		158
144	# convert position array to integers	159	# convert position array to integers
145	sub harmonize {	160	sub harmonize {
…		…
195	reconfigure_widgets;	210	reconfigure_widgets;
196	}	211	}
197		212
198	#############################################################################	213	#############################################################################
199		214
		215	package CFPlus::UI::Event;
		216
		217	sub xy {
		218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		219	}
		220
		221	#############################################################################
		222
200	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
201		224
202	use strict;	225	use strict;
203		226
204	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
205		228
206	sub new {	229	sub new {
207	my $class = shift;	230	my $class = shift;
208		231
209	my $self = bless {	232	my $self = bless {
…		…
214	h => undef,	237	h => undef,
215	can_events => 1,	238	can_events => 1,
216	@_	239	@_
217	}, $class;	240	}, $class;
218		241
219	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
220		243
221	for (keys %$self) {	244	for (keys %$self) {
222	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
223	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
224	}	247	}
225	}	248	}
226		249
227	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
228	$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};
229	$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};
230	$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};
231	$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};
232		255
233	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
234	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
235		258
236	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
241		264
242	sub destroy {	265	sub destroy {
243	my ($self) = @_;	266	my ($self) = @_;
244		267
245	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
246	%$self = ();	270	%$self = ();
247	}	271	}
248		272
		273	sub TO_JSON {
		274	{ __widget_ref__ => $_[0]{s_id} }
		275	}
		276
249	sub show {	277	sub show {
250	my ($self) = @_;	278	my ($self) = @_;
251		279
252	return if $self->{parent};	280	return if $self->{parent};
253		281
254	$CFClient::UI::ROOT->add ($self);	282	$CFPlus::UI::ROOT->add ($self);
255	}	283	}
256		284
257	sub set_visible {	285	sub set_visible {
258	my ($self) = @_;	286	my ($self) = @_;
259		287
…		…
280	delete $self->{root};	308	delete $self->{root};
281		309
282	undef $GRAB if $GRAB == $self;	310	undef $GRAB if $GRAB == $self;
283	undef $HOVER if $HOVER == $self;	311	undef $HOVER if $HOVER == $self;
284		312
285	$CFClient::UI::TOOLTIP_WATCHER->cb->()	313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
286	if $TOOLTIP->{owner} == $self;	314	if $TOOLTIP->{owner} == $self;
287		315
288	$self->emit ("focus_out");	316	$self->emit ("focus_out");
289	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
290	}	318	}
…		…
292	sub set_visibility {	320	sub set_visibility {
293	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
294		322
295	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
296		324
297	$visible ? $self->hide	325	$visible ? $self->show
298	: $self->show;	326	: $self->hide;
299	}	327	}
300		328
301	sub toggle_visibility {	329	sub toggle_visibility {
302	my ($self) = @_;	330	my ($self) = @_;
303		331
…		…
347	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
348		376
349	if ($self->{aspect}) {	377	if ($self->{aspect}) {
350	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
351		379
352	$w = List::Util::min $w, int $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
353	$h = List::Util::min $h, int $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
354		382
355	# use alignment to adjust x, y	383	# use alignment to adjust x, y
356		384
357	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
358	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
399		427
400	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
401		429
402	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
403		431
404	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
405	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
406	$CFClient::UI::TOOLTIP_WATCHER->cb->();	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
407	}	435	}
408	}	436	}
409		437
410	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
411	sub coord2local {	439	sub coord2local {
412	my ($self, $x, $y) = @_;	440	my ($self, $x, $y) = @_;
413		441
		442	Carp::confess unless $self->{parent};#d#
		443
414	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
415	}	445	}
416		446
417	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
418	sub coord2global {	448	sub coord2global {
419	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
		450
		451	Carp::confess unless $self->{parent};#d#
420		452
421	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
422	}	454	}
423		455
424	sub invoke_focus_in {	456	sub invoke_focus_in {
…		…
458		490
459	sub invoke_mouse_motion { 0 }	491	sub invoke_mouse_motion { 0 }
460	sub invoke_button_up { 0 }	492	sub invoke_button_up { 0 }
461	sub invoke_key_down { 0 }	493	sub invoke_key_down { 0 }
462	sub invoke_key_up { 0 }	494	sub invoke_key_up { 0 }
		495	sub invoke_mouse_wheel { 0 }
463		496
464	sub invoke_button_down {	497	sub invoke_button_down {
465	my ($self, $ev, $x, $y) = @_;	498	my ($self, $ev, $x, $y) = @_;
466		499
467	$self->grab_focus;	500	$self->grab_focus;
468		501
469	warn "button down $ev->{button} $x $y\n";#d#
470
471	0	502	0
472	}	503	}
473		504
474	sub connect {	505	sub connect {
475	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
476		507
477	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	}
478	}	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	);
479		528
480	sub emit {	529	sub emit {
481	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
482		531
483	#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
484	(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
485	|| ($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
486	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
487	}	550	}
488		551
489	sub find_widget {	552	sub find_widget {
490	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
491		554
…		…
499	}	562	}
500		563
501	sub set_parent {	564	sub set_parent {
502	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
503		566
504	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
505	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
506	}	569	}
507		570
508	sub realloc {	571	sub realloc {
509	my ($self) = @_;	572	my ($self) = @_;
…		…
575	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
576	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
577	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
578	glEnd;	641	glEnd;
579	glPopMatrix;	642	glPopMatrix;
580	#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;
581	}	644	}
582		645
583	$self->_draw;	646	$self->_draw;
584	glPopMatrix;	647	glPopMatrix;
585	}	648	}
…		…
588	my ($self) = @_;	651	my ($self) = @_;
589		652
590	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
591	}	654	}
592		655
		656	my $cntx;#d#
593	sub DESTROY {	657	sub DESTROY {
594	my ($self) = @_;	658	my ($self) = @_;
595		659
596	return if CFClient::in_destruct;	660	return if CFPlus::in_destruct;
597
598	delete $WIDGET{$self+0};
599		661
600	eval { $self->destroy };	662	eval { $self->destroy };
601	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};
602	}	666	}
603		667
604	#############################################################################	668	#############################################################################
605		669
606	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
607		671
608	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
609		673
610	use strict;	674	use strict;
611	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
612		676
613	sub new {	677	sub new {
614	my $class = shift;	678	my $class = shift;
615		679
616	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
647	}	711	}
648	}	712	}
649		713
650	#############################################################################	714	#############################################################################
651		715
652	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
653		717
654	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
655		719
656	sub new {	720	sub new {
657	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
658	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
659	}	723	}
…		…
666		730
667	sub draw { }	731	sub draw { }
668		732
669	#############################################################################	733	#############################################################################
670		734
671	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
672		736
673	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
674		738
675	sub new {	739	sub new {
676	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
677		741
678	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
687	if $children;	751	if $children;
688		752
689	$self	753	$self
690	}	754	}
691		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
692	sub add {	764	sub add {
693	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
694		766
695	$_->set_parent ($self)	767	$_->set_parent ($self)
696	for @widgets;	768	for @widgets;
…		…
756	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
757	}	829	}
758		830
759	#############################################################################	831	#############################################################################
760		832
761	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
762		834
763	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
764		836
765	sub new {	837	sub new {
766	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
767		839
768	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
769		841
770	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
771	}	843	}
772		844
773	sub add {	845	sub add {
…		…
780	sub remove {	852	sub remove {
781	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
782		854
783	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
784		856
785	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
786	unless @{$self->{children}};	858	unless @{$self->{children}};
787	}	859	}
788		860
789	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
790		862
…		…
802		874
803	#############################################################################	875	#############################################################################
804		876
805	# back-buffered drawing area	877	# back-buffered drawing area
806		878
807	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
808		880
809	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
810		882
811	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
812		884
813	sub new {	885	sub new {
814	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
815		887
816	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
838	}	910	}
839		911
840	sub render_child {	912	sub render_child {
841	my ($self) = @_;	913	my ($self) = @_;
842		914
843	$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 {
844	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
845	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
846		918
847	{	919	{
848	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
849		921
850	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
851	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
852	}	926	}
853
854	$self->_render;
855	};	927	};
856	}	928	}
857		929
858	sub _draw {	930	sub _draw {
859	my ($self) = @_;	931	my ($self) = @_;
860
861	my ($w, $h) = @$self{qw(w h)};
862		932
863	my $tex = $self->{texture}	933	my $tex = $self->{texture}
864	or return;	934	or return;
865		935
866	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
867	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
868	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
869		939
870	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
871		941
872	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
873	}	943	}
874		944
875	#############################################################################	945	#############################################################################
876		946
877	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
878		948
879	our @ISA = CFClient::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
880		950
881	sub new {	951	sub new {
882	my $class = shift;	952	my $class = shift;
883		953
884	$class->SUPER::new (	954	$class->SUPER::new (
…		…
944	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
945	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
946	) {	1016	) {
947	$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})
948	} else {	1018	} else {
949	$self->CFClient::UI::Base::find_widget ($x, $y)	1019	$self->CFPlus::UI::Base::find_widget ($x, $y)
950	}	1020	}
951	}	1021	}
952		1022
953	sub _render {	1023	sub _render {
954	my ($self) = @_;	1024	my ($self) = @_;
955		1025
956	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};
957	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};
958		1028
959	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1029	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
960		1030
961	$self->SUPER::_render;	1031	$self->SUPER::_render;
962	}	1032	}
963		1033
964	#############################################################################	1034	#############################################################################
965		1035
966	package CFClient::UI::ScrolledWindow;	1036	package CFPlus::UI::ScrolledWindow;
967		1037
968	our @ISA = CFClient::UI::HBox::;	1038	our @ISA = CFPlus::UI::Table::;
969		1039
970	sub new {	1040	sub new {
971	my ($class, %arg) = @_;	1041	my ($class, %arg) = @_;
972		1042
973	my $child = delete $arg{child};	1043	my $child = delete $arg{child};
974		1044
975	my $self;	1045	my $self;
976		1046
977	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
978	vertical => 1,	1057	vertical => 1,
979	range => [0, 0, 1, 0.01], # HACK fix	1058	range => [0, 0, 1, 0.01], # HACK fix
980	on_changed => sub {	1059	on_changed => sub {
981	$self->{vp}->set_offset (0, $_[1]);	1060	$self->{vpos} = $_[1];
		1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
982	},	1062	},
983	;	1063	;
984		1064
985	$self = $class->SUPER::new (	1065	$self = $class->SUPER::new (
986	vp => (new CFClient::UI::ViewPort expand => 1),	1066	vp => (new CFPlus::UI::ViewPort expand => 1),
		1067	can_events => 1,
987	slider => $slider,	1068	hslider => $hslider,
		1069	vslider => $vslider,
		1070	col_expand => [1, 0],
		1071	row_expand => [1, 0],
988	%arg,	1072	%arg,
989	);	1073	);
990		1074
		1075	$self->SUPER::add (0, 0, $self->{vp});
991	$self->SUPER::add ($self->{vp}, $self->{slider});	1076	$self->SUPER::add (1, 0, $self->{vslider});
		1077	$self->SUPER::add (0, 1, $self->{hslider});
		1078
992	$self->add ($child) if $child;	1079	$self->add ($child) if $child;
993		1080
994	$self	1081	$self
995	}	1082	}
996		1083
…		…
1000	my ($self, $widget) = @_;	1087	my ($self, $widget) = @_;
1001		1088
1002	$self->{vp}->add ($self->{child} = $widget);	1089	$self->{vp}->add ($self->{child} = $widget);
1003	}	1090	}
1004		1091
1005	sub invoke_button_down {	1092	sub invoke_mouse_wheel {
1006	my ($self, $ev) = @_;	1093	my ($self, $ev) = @_;
1007		1094
1008	warn "button down $ev->{button}\n";#d#	1095	return 0 unless $ev->{dy}; # only vertical movements
		1096
		1097	$self->{vslider}->emit (mouse_wheel => $ev);
		1098
1009		1099	1
1010	0
1011	}	1100	}
1012		1101
1013	sub update_slider {	1102	sub update_slider {
1014	my ($self) = @_;	1103	my ($self) = @_;
1015		1104
		1105	my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});
1016	$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);
1017	}	1112	}
1018		1113
1019	sub update {	1114	sub update {
1020	my ($self) = @_;	1115	my ($self) = @_;
1021		1116
1022	$self->SUPER::update;	1117	$self->SUPER::update;
1023
1024	$self->update_slider;	1118	$self->update_slider;
1025	}	1119	}
1026		1120
1027	sub invoke_size_allocate {	1121	sub invoke_size_allocate {
1028	my ($self, $w, $h) = @_;	1122	my ($self, $w, $h) = @_;
1029		1123
1030	$self->update_slider;	1124	$self->update_slider;
1031
1032	$self->SUPER::invoke_size_allocate ($w, $h)	1125	$self->SUPER::invoke_size_allocate ($w, $h)
1033	}	1126	}
1034		1127
1035	#############################################################################	1128	#############################################################################
1036		1129
1037	package CFClient::UI::Frame;	1130	package CFPlus::UI::Frame;
1038		1131
1039	our @ISA = CFClient::UI::Bin::;	1132	our @ISA = CFPlus::UI::Bin::;
1040		1133
1041	use CFClient::OpenGL;	1134	use CFPlus::OpenGL;
1042		1135
1043	sub new {	1136	sub new {
1044	my $class = shift;	1137	my $class = shift;
1045		1138
1046	$class->SUPER::new (	1139	$class->SUPER::new (
…		…
1072	$self->SUPER::_draw;	1165	$self->SUPER::_draw;
1073	}	1166	}
1074		1167
1075	#############################################################################	1168	#############################################################################
1076		1169
1077	package CFClient::UI::FancyFrame;	1170	package CFPlus::UI::FancyFrame;
1078		1171
1079	our @ISA = CFClient::UI::Bin::;	1172	our @ISA = CFPlus::UI::Bin::;
1080		1173
1081	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;
1082		1275
1083	my $bg =	1276	my $bg =
1084	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1277	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1085	mipmap => 1, wrap => 1;	1278	mipmap => 1, wrap => 1;
1086		1279
1087	my @border =	1280	my @border =
1088	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1281	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1089	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1282	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1090		1283
1091	sub new {	1284	sub new {
1092	my ($class, %arg) = @_;	1285	my ($class, %arg) = @_;
1093		1286
…		…
1099	min_w => 64,	1292	min_w => 64,
1100	min_h => 32,	1293	min_h => 32,
1101	%arg,	1294	%arg,
1102	);	1295	);
1103		1296
1104	$self->{title_widget} = new CFClient::UI::Label	1297	$self->{title_widget} = new CFPlus::UI::Label
1105	align => 0,	1298	align => 0,
1106	valign => 1,	1299	valign => 1,
1107	text => $self->{title},	1300	text => $self->{title},
1108	fontsize => $self->{border},	1301	fontsize => $self->{border},
1109	if exists $self->{title};	1302	if exists $self->{title};
1110		1303
1111	if ($self->{has_close_button}) {	1304	if ($self->{has_close_button}) {
1112	$self->{close_button} =	1305	$self->{close_button} =
1113	new CFClient::UI::ImageButton	1306	new CFPlus::UI::ImageButton
1114	path => 'x1_close.png',	1307	path => 'x1_close.png',
1115	on_activate => sub { $self->emit ("delete") };	1308	on_activate => sub { $self->emit ("delete") };
1116		1309
1117	$self->CFClient::UI::Container::add ($self->{close_button});	1310	$self->CFPlus::UI::Container::add ($self->{close_button});
1118	}	1311	}
1119		1312
1120	$self	1313	$self
1121	}	1314	}
1122		1315
1123	sub add {	1316	sub add {
1124	my ($self, @widgets) = @_;	1317	my ($self, @widgets) = @_;
1125		1318
1126	$self->SUPER::add (@widgets);	1319	$self->SUPER::add (@widgets);
1127	$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};
1128	$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};
1129	}	1322	}
1130		1323
1131	sub border {	1324	sub border {
1132	int $_[0]{border} * $::FONTSIZE	1325	int $_[0]{border} * $::FONTSIZE
1133	}	1326	}
…		…
1241	$self->{motion}->($ev, $x, $y) if $self->{motion};	1434	$self->{motion}->($ev, $x, $y) if $self->{motion};
1242		1435
1243	! ! $self->{motion}	1436	! ! $self->{motion}
1244	}	1437	}
1245		1438
		1439	sub invoke_visibility_change {
		1440	my ($self, $visible) = @_;
		1441
		1442	delete $self->{motion} unless $visible;
		1443
		1444	0
		1445	}
		1446
1246	sub _draw {	1447	sub _draw {
1247	my ($self) = @_;	1448	my ($self) = @_;
1248		1449
1249	my $child = $self->{children}[0];	1450	my $child = $self->{children}[0];
1250		1451
…		…
1287	if $self->{close_button};	1488	if $self->{close_button};
1288	}	1489	}
1289		1490
1290	#############################################################################	1491	#############################################################################
1291		1492
1292	package CFClient::UI::Table;	1493	package CFPlus::UI::Table;
1293		1494
1294	our @ISA = CFClient::UI::Base::;	1495	our @ISA = CFPlus::UI::Base::;
1295		1496
1296	use List::Util qw(max sum);	1497	use List::Util qw(max sum);
1297		1498
1298	use CFClient::OpenGL;	1499	use CFPlus::OpenGL;
1299		1500
1300	sub new {	1501	sub new {
1301	my $class = shift;	1502	my $class = shift;
1302		1503
1303	$class->SUPER::new (	1504	$class->SUPER::new (
1304	col_expand => [],	1505	col_expand => [],
		1506	row_expand => [],
1305	@_,	1507	@_,
1306	)	1508	)
1307	}	1509	}
1308		1510
1309	sub children {	1511	sub children {
1310	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1512	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1311	}	1513	}
1312		1514
1313	sub add {	1515	sub add {
1314	my ($self, $x, $y, $child) = @_;	1516	my ($self) = shift;
1315		1517
		1518	while (@_) {
		1519	my ($x, $y, $child) = splice @_, 0, 3, ();
1316	$child->set_parent ($self);	1520	$child->set_parent ($self);
1317	$self->{children}[$y][$x] = $child;	1521	$self->{children}[$y][$x] = $child;
		1522	}
1318		1523
		1524	$self->{force_realloc} = 1;
		1525	$self->{force_size_alloc} = 1;
1319	$self->realloc;	1526	$self->realloc;
1320	}	1527	}
1321		1528
1322	sub remove {	1529	sub remove {
1323	my ($self, $child) = @_;	1530	my ($self, $child) = @_;
…		…
1379	my ($ws, $hs) = $self->get_wh;	1586	my ($ws, $hs) = $self->get_wh;
1380		1587
1381	my $req_w = (sum @$ws) || 1;	1588	my $req_w = (sum @$ws) || 1;
1382	my $req_h = (sum @$hs) || 1;	1589	my $req_h = (sum @$hs) || 1;
1383		1590
1384	# TODO: nicer code && do row_expand	1591	# TODO: nicer code
1385	my @col_expand = @{$self->{col_expand}};	1592	my @col_expand = @{$self->{col_expand}};
1386	@col_expand = (1) x @$ws unless @col_expand;	1593	@col_expand = (1) x @$ws unless @col_expand;
1387	my $col_expand = (sum @col_expand) || 1;	1594	my $col_expand = (sum @col_expand) || 1;
1388		1595
1389	# linearly scale sizes
1390	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1596	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1391	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1392		1597
1393	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
1394	CFClient::UI::harmonize $hs;	1606	CFPlus::UI::harmonize $hs;
1395		1607
1396	my $y;	1608	my $y;
1397		1609
1398	for my $r (0 .. $#{$self->{children}}) {	1610	for my $r (0 .. $#{$self->{children}}) {
1399	my $row = $self->{children}[$r]	1611	my $row = $self->{children}[$r]
…		…
1442	}	1654	}
1443	}	1655	}
1444		1656
1445	#############################################################################	1657	#############################################################################
1446		1658
1447	package CFClient::UI::Box;	1659	package CFPlus::UI::Box;
1448		1660
1449	our @ISA = CFClient::UI::Container::;	1661	our @ISA = CFPlus::UI::Container::;
1450		1662
1451	sub size_request {	1663	sub size_request {
1452	my ($self) = @_;	1664	my ($self) = @_;
1453		1665
1454	$self->{vertical}	1666	$self->{vertical}
…		…
1487	$req[$_] += $space * $children[$_]{expand}	1699	$req[$_] += $space * $children[$_]{expand}
1488	for 0 .. $#children;	1700	for 0 .. $#children;
1489	}	1701	}
1490	}	1702	}
1491		1703
1492	CFClient::UI::harmonize \@req;	1704	CFPlus::UI::harmonize \@req;
1493		1705
1494	my $pos = 0;	1706	my $pos = 0;
1495	for (0 .. $#children) {	1707	for (0 .. $#children) {
1496	my $alloc = $req[$_];	1708	my $alloc = $req[$_];
1497	$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));
…		…
1502	1	1714	1
1503	}	1715	}
1504		1716
1505	#############################################################################	1717	#############################################################################
1506		1718
1507	package CFClient::UI::HBox;	1719	package CFPlus::UI::HBox;
1508		1720
1509	our @ISA = CFClient::UI::Box::;	1721	our @ISA = CFPlus::UI::Box::;
1510		1722
1511	sub new {	1723	sub new {
1512	my $class = shift;	1724	my $class = shift;
1513		1725
1514	$class->SUPER::new (	1726	$class->SUPER::new (
…		…
1517	)	1729	)
1518	}	1730	}
1519		1731
1520	#############################################################################	1732	#############################################################################
1521		1733
1522	package CFClient::UI::VBox;	1734	package CFPlus::UI::VBox;
1523		1735
1524	our @ISA = CFClient::UI::Box::;	1736	our @ISA = CFPlus::UI::Box::;
1525		1737
1526	sub new {	1738	sub new {
1527	my $class = shift;	1739	my $class = shift;
1528		1740
1529	$class->SUPER::new (	1741	$class->SUPER::new (
…		…
1532	)	1744	)
1533	}	1745	}
1534		1746
1535	#############################################################################	1747	#############################################################################
1536		1748
1537	package CFClient::UI::Label;	1749	package CFPlus::UI::Label;
1538		1750
1539	our @ISA = CFClient::UI::DrawBG::;	1751	our @ISA = CFPlus::UI::DrawBG::;
1540		1752
1541	use CFClient::OpenGL;	1753	use CFPlus::OpenGL;
1542		1754
1543	sub new {	1755	sub new {
1544	my ($class, %arg) = @_;	1756	my ($class, %arg) = @_;
1545		1757
1546	my $self = $class->SUPER::new (	1758	my $self = $class->SUPER::new (
…		…
1549	#active_bg => none	1761	#active_bg => none
1550	#font => default_font	1762	#font => default_font
1551	#text => initial text	1763	#text => initial text
1552	#markup => initial narkup	1764	#markup => initial narkup
1553	#max_w => maximum pixel width	1765	#max_w => maximum pixel width
		1766	#style => 0, # render flags
1554	ellipsise => 3, # end	1767	ellipsise => 3, # end
1555	layout => (new CFClient::Layout),	1768	layout => (new CFPlus::Layout),
1556	fontsize => 1,	1769	fontsize => 1,
1557	align => -1,	1770	align => -1,
1558	valign => -1,	1771	valign => -1,
1559	padding_x => 2,	1772	padding_x => 2,
1560	padding_y => 2,	1773	padding_y => 2,
1561	can_events => 0,	1774	can_events => 0,
1562	%arg	1775	%arg
1563	);	1776	);
1564		1777
1565	if (exists $self->{template}) {	1778	if (exists $self->{template}) {
1566	my $layout = new CFClient::Layout;	1779	my $layout = new CFPlus::Layout;
1567	$layout->set_text (delete $self->{template});	1780	$layout->set_text (delete $self->{template});
1568	$self->{template} = $layout;	1781	$self->{template} = $layout;
1569	}	1782	}
1570		1783
1571	if (exists $self->{markup}) {	1784	if (exists $self->{markup}) {
…		…
1573	} else {	1786	} else {
1574	$self->set_text (delete $self->{text});	1787	$self->set_text (delete $self->{text});
1575	}	1788	}
1576		1789
1577	$self	1790	$self
1578	}
1579
1580	sub escape($) {
1581	local $_ = $_[0];
1582
1583	s/&/&amp;/g;
1584	s/>/&gt;/g;
1585	s/</&lt;/g;
1586
1587	$_
1588	}	1791	}
1589		1792
1590	sub update {	1793	sub update {
1591	my ($self) = @_;	1794	my ($self) = @_;
1592		1795
…		…
1719	};	1922	};
1720		1923
1721	my $w = List::Util::min $self->{w} + 4, $size->[0];	1924	my $w = List::Util::min $self->{w} + 4, $size->[0];
1722	my $h = List::Util::min $self->{h} + 2, $size->[1];	1925	my $h = List::Util::min $self->{h} + 2, $size->[1];
1723		1926
1724	$self->{layout}->render ($self->{ox}, $self->{oy});	1927	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1725	}	1928	}
1726		1929
1727	#############################################################################	1930	#############################################################################
1728		1931
1729	package CFClient::UI::EntryBase;	1932	package CFPlus::UI::EntryBase;
1730		1933
1731	our @ISA = CFClient::UI::Label::;	1934	our @ISA = CFPlus::UI::Label::;
1732		1935
1733	use CFClient::OpenGL;	1936	use CFPlus::OpenGL;
1734		1937
1735	sub new {	1938	sub new {
1736	my $class = shift;	1939	my $class = shift;
1737		1940
1738	$class->SUPER::new (	1941	$class->SUPER::new (
…		…
1742	active_fg => [0, 0, 0],	1945	active_fg => [0, 0, 0],
1743	can_hover => 1,	1946	can_hover => 1,
1744	can_focus => 1,	1947	can_focus => 1,
1745	valign => 0,	1948	valign => 0,
1746	can_events => 1,	1949	can_events => 1,
		1950	ellipsise => 0,
1747	#text => ...	1951	#text => ...
1748	#hidden => "*",	1952	#hidden => "*",
1749	@_	1953	@_
1750	)	1954	)
1751	}	1955	}
…		…
1796	my $sym = $ev->{sym};	2000	my $sym = $ev->{sym};
1797	my $uni = $ev->{unicode};	2001	my $uni = $ev->{unicode};
1798		2002
1799	my $text = $self->get_text;	2003	my $text = $self->get_text;
1800		2004
		2005	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2006
1801	if ($uni == 8) {	2007	if ($uni == 8) {
1802	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2008	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1803	} elsif ($uni == 127) {	2009	} elsif ($uni == 127) {
1804	substr $text, $self->{cursor}, 1, "";	2010	substr $text, $self->{cursor}, 1, "";
1805	} elsif ($sym == CFClient::SDLK_LEFT) {	2011	} elsif ($sym == CFPlus::SDLK_LEFT) {
1806	--$self->{cursor} if $self->{cursor};	2012	--$self->{cursor} if $self->{cursor};
1807	} elsif ($sym == CFClient::SDLK_RIGHT) {	2013	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1808	++$self->{cursor} if $self->{cursor} < length $self->{text};	2014	++$self->{cursor} if $self->{cursor} < length $self->{text};
1809	} 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 = "";
1810	$self->{cursor} = 0;	2029	$self->{cursor} = 0;
1811	} elsif ($sym == CFClient::SDLK_END) {
1812	$self->{cursor} = length $text;
1813	} elsif ($uni == 27) {	2030	} elsif ($uni == 27) {
1814	$self->emit ('escape');	2031	$self->emit ('escape');
1815	} elsif ($uni) {	2032	} elsif ($uni == 0x0d) {
		2033	substr $text, $self->{cursor}++, 0, "\012";
		2034	} elsif ($uni >= 0x20) {
1816	substr $text, $self->{cursor}++, 0, chr $uni;	2035	substr $text, $self->{cursor}++, 0, chr $uni;
1817	} else {	2036	} else {
1818	return 0;	2037	return 0;
1819	}	2038	}
1820		2039
1821	$self->_set_text ($text);	2040	$self->_set_text ($text);
1822		2041
1823	$self->realloc;	2042	$self->realloc;
		2043	$self->update;
1824		2044
1825	1	2045	1
1826	}	2046	}
1827		2047
1828	sub invoke_focus_in {	2048	sub invoke_focus_in {
…		…
1890	utf8::encode $text;	2110	utf8::encode $text;
1891		2111
1892	@$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)
1893	}	2113	}
1894		2114
1895	glColor @{$self->{fg}};
1896	glBegin GL_LINES;	2115	glBegin GL_LINES;
1897	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};
1898	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};
1899	glEnd;	2118	glEnd;
1900	}	2119	}
1901	}	2120	}
1902		2121
		2122	#############################################################################
		2123
1903	package CFClient::UI::Entry;	2124	package CFPlus::UI::Entry;
1904		2125
1905	our @ISA = CFClient::UI::EntryBase::;	2126	our @ISA = CFPlus::UI::EntryBase::;
1906		2127
1907	use CFClient::OpenGL;	2128	use CFPlus::OpenGL;
1908		2129
1909	sub invoke_key_down {	2130	sub invoke_key_down {
1910	my ($self, $ev) = @_;	2131	my ($self, $ev) = @_;
1911		2132
1912	my $sym = $ev->{sym};	2133	my $sym = $ev->{sym};
1913		2134
1914	if ($sym == 13) {	2135	if ($ev->{uni} == 0x0d || $sym == 13) {
1915	unshift @{$self->{history}},	2136	unshift @{$self->{history}},
1916	my $txt = $self->get_text;	2137	my $txt = $self->get_text;
1917		2138
1918	$self->{history_pointer} = -1;	2139	$self->{history_pointer} = -1;
1919	$self->{history_saveback} = '';	2140	$self->{history_saveback} = '';
1920	$self->emit (activate => $txt);	2141	$self->emit (activate => $txt);
1921	$self->update;	2142	$self->update;
1922		2143
1923	} elsif ($sym == CFClient::SDLK_UP) {	2144	} elsif ($sym == CFPlus::SDLK_UP) {
1924	if ($self->{history_pointer} < 0) {	2145	if ($self->{history_pointer} < 0) {
1925	$self->{history_saveback} = $self->get_text;	2146	$self->{history_saveback} = $self->get_text;
1926	}	2147	}
1927	if (@{$self->{history} || []} > 0) {	2148	if (@{$self->{history} || []} > 0) {
1928	$self->{history_pointer}++;	2149	$self->{history_pointer}++;
…		…
1930	$self->{history_pointer} = @{$self->{history} || []} - 1;	2151	$self->{history_pointer} = @{$self->{history} || []} - 1;
1931	}	2152	}
1932	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2153	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1933	}	2154	}
1934		2155
1935	} elsif ($sym == CFClient::SDLK_DOWN) {	2156	} elsif ($sym == CFPlus::SDLK_DOWN) {
1936	$self->{history_pointer}--;	2157	$self->{history_pointer}--;
1937	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2158	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1938		2159
1939	if ($self->{history_pointer} >= 0) {	2160	if ($self->{history_pointer} >= 0) {
1940	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2161	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1949	1	2170	1
1950	}	2171	}
1951		2172
1952	#############################################################################	2173	#############################################################################
1953		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
1954	package CFClient::UI::Button;	2214	package CFPlus::UI::Button;
1955		2215
1956	our @ISA = CFClient::UI::Label::;	2216	our @ISA = CFPlus::UI::Label::;
1957		2217
1958	use CFClient::OpenGL;	2218	use CFPlus::OpenGL;
1959		2219
1960	my @tex =	2220	my @tex =
1961	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2221	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1962	qw(b1_button_active.png);	2222	qw(b1_button_active.png);
1963		2223
1964	sub new {	2224	sub new {
1965	my $class = shift;	2225	my $class = shift;
1966		2226
…		…
2003	$self->SUPER::_draw;	2263	$self->SUPER::_draw;
2004	}	2264	}
2005		2265
2006	#############################################################################	2266	#############################################################################
2007		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
2008	package CFClient::UI::ImageButton;	2417	package CFPlus::UI::ImageButton;
2009		2418
2010	our @ISA = CFClient::UI::Image::;	2419	our @ISA = CFPlus::UI::Image::;
2011		2420
2012	use CFClient::OpenGL;	2421	use CFPlus::OpenGL;
2013		2422
2014	my %textures;	2423	my %textures;
2015		2424
2016	sub new {	2425	sub new {
2017	my $class = shift;	2426	my $class = shift;
…		…
2039	1	2448	1
2040	}	2449	}
2041		2450
2042	#############################################################################	2451	#############################################################################
2043		2452
2044	package CFClient::UI::CheckBox;
2045
2046	our @ISA = CFClient::UI::DrawBG::;
2047
2048	my @tex =
2049	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2050	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2051
2052	use CFClient::OpenGL;
2053
2054	sub new {
2055	my $class = shift;
2056
2057	$class->SUPER::new (
2058	padding_x => 2,
2059	padding_y => 2,
2060	fg => [1, 1, 1],
2061	active_fg => [1, 1, 0],
2062	bg => [0, 0, 0, 0.2],
2063	active_bg => [1, 1, 1, 0.5],
2064	state => 0,
2065	can_hover => 1,
2066	@_
2067	)
2068	}
2069
2070	sub size_request {
2071	my ($self) = @_;
2072
2073	(6) x 2
2074	}
2075
2076	sub toggle {
2077	my ($self) = @_;
2078
2079	$self->{state} = !$self->{state};
2080	$self->emit (changed => $self->{state});
2081	$self->update;
2082	}
2083
2084	sub invoke_button_down {
2085	my ($self, $ev, $x, $y) = @_;
2086
2087	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2088	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2089	$self->toggle;
2090	} else {
2091	return 0
2092	}
2093
2094	1
2095	}
2096
2097	sub _draw {
2098	my ($self) = @_;
2099
2100	$self->SUPER::_draw;
2101
2102	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2103
2104	my ($w, $h) = @$self{qw(w h)};
2105
2106	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2107
2108	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2109
2110	my $tex = $self->{state} ? $tex[1] : $tex[0];
2111
2112	glEnable GL_TEXTURE_2D;
2113	$tex->draw_quad_alpha (0, 0, $s, $s);
2114	glDisable GL_TEXTURE_2D;
2115	}
2116
2117	#############################################################################
2118
2119	package CFClient::UI::Image;	2453	package CFPlus::UI::VGauge;
2120		2454
2121	our @ISA = CFClient::UI::Base::;	2455	our @ISA = CFPlus::UI::Base::;
2122
2123	use CFClient::OpenGL;
2124
2125	our %texture_cache;
2126
2127	sub new {
2128	my $class = shift;
2129
2130	my $self = $class->SUPER::new (
2131	can_events => 0,
2132	@_,
2133	);
2134
2135	$self->{path} || $self->{tex}
2136	or Carp::croak "'path' or 'tex' attributes required";
2137
2138	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2139	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2140
2141	Scalar::Util::weaken $texture_cache{$self->{path}};
2142
2143	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2144
2145	$self
2146	}
2147
2148	sub size_request {
2149	my ($self) = @_;
2150
2151	($self->{tex}{w}, $self->{tex}{h})
2152	}
2153
2154	sub _draw {
2155	my ($self) = @_;
2156
2157	my $tex = $self->{tex};
2158
2159	my ($w, $h) = ($self->{w}, $self->{h});
2160
2161	if ($self->{rot90}) {
2162	glRotate 90, 0, 0, 1;
2163	glTranslate 0, -$self->{w}, 0;
2164
2165	($w, $h) = ($h, $w);
2166	}
2167
2168	glEnable GL_TEXTURE_2D;
2169	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170
2171	$tex->draw_quad_alpha (0, 0, $w, $h);
2172
2173	glDisable GL_TEXTURE_2D;
2174	}
2175
2176	#############################################################################
2177
2178	package CFClient::UI::VGauge;
2179
2180	our @ISA = CFClient::UI::Base::;
2181		2456
2182	use List::Util qw(min max);	2457	use List::Util qw(min max);
2183		2458
2184	use CFClient::OpenGL;	2459	use CFPlus::OpenGL;
2185		2460
2186	my %tex = (	2461	my %tex = (
2187	food => [	2462	food => [
2188	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2463	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2464	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2190	],	2465	],
2191	grace => [	2466	grace => [
2192	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2467	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2193	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2468	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2194	],	2469	],
2195	hp => [	2470	hp => [
2196	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2471	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2197	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2472	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2198	],	2473	],
2199	mana => [	2474	mana => [
2200	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2475	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2201	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2476	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2202	],	2477	],
2203	);	2478	);
2204		2479
2205	# eg. VGauge->new (gauge => 'food'), default gauge: food	2480	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2308	glDisable GL_TEXTURE_2D;	2583	glDisable GL_TEXTURE_2D;
2309	}	2584	}
2310		2585
2311	#############################################################################	2586	#############################################################################
2312		2587
2313	package CFClient::UI::Gauge;	2588	package CFPlus::UI::Gauge;
2314		2589
2315	our @ISA = CFClient::UI::VBox::;	2590	our @ISA = CFPlus::UI::VBox::;
2316		2591
2317	sub new {	2592	sub new {
2318	my ($class, %arg) = @_;	2593	my ($class, %arg) = @_;
2319		2594
2320	my $self = $class->SUPER::new (	2595	my $self = $class->SUPER::new (
…		…
2322	can_hover => 1,	2597	can_hover => 1,
2323	can_events => 1,	2598	can_events => 1,
2324	%arg,	2599	%arg,
2325	);	2600	);
2326		2601
2327	$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");
2328	$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);
2329	$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");
2330		2605
2331	$self	2606	$self
2332	}	2607	}
2333		2608
2334	sub set_fontsize {	2609	sub set_fontsize {
…		…
2355	$self->{value}->set_text ($val);	2630	$self->{value}->set_text ($val);
2356	}	2631	}
2357		2632
2358	#############################################################################	2633	#############################################################################
2359		2634
2360	package CFClient::UI::Slider;	2635	package CFPlus::UI::Slider;
2361		2636
2362	use strict;	2637	use strict;
2363		2638
2364	use CFClient::OpenGL;	2639	use CFPlus::OpenGL;
2365		2640
2366	our @ISA = CFClient::UI::DrawBG::;	2641	our @ISA = CFPlus::UI::DrawBG::;
2367		2642
2368	my @tex =	2643	my @tex =
2369	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2644	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2370	qw(s1_slider.png s1_slider_bg.png);	2645	qw(s1_slider.png s1_slider_bg.png);
2371		2646
2372	sub new {	2647	sub new {
2373	my $class = shift;	2648	my $class = shift;
2374		2649
…		…
2463	}	2738	}
2464		2739
2465	1	2740	1
2466	}	2741	}
2467		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
2468	sub update {	2755	sub update {
2469	my ($self) = @_;	2756	my ($self) = @_;
2470		2757
2471	delete $self->{knob_w};	2758	delete $self->{knob_w};
2472	$self->SUPER::update;	2759	$self->SUPER::update;
…		…
2519	glDisable GL_TEXTURE_2D;	2806	glDisable GL_TEXTURE_2D;
2520	}	2807	}
2521		2808
2522	#############################################################################	2809	#############################################################################
2523		2810
2524	package CFClient::UI::ValSlider;	2811	package CFPlus::UI::ValSlider;
2525		2812
2526	our @ISA = CFClient::UI::HBox::;	2813	our @ISA = CFPlus::UI::HBox::;
2527		2814
2528	sub new {	2815	sub new {
2529	my ($class, %arg) = @_;	2816	my ($class, %arg) = @_;
2530		2817
2531	my $range = delete $arg{range};	2818	my $range = delete $arg{range};
2532		2819
2533	my $self = $class->SUPER::new (	2820	my $self = $class->SUPER::new (
2534	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2821	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2535	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2822	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2536	to_value => sub { shift },	2823	to_value => sub { shift },
2537	from_value => sub { shift },	2824	from_value => sub { shift },
2538	%arg,	2825	%arg,
2539	);	2826	);
2540		2827
…		…
2560	sub set_range { shift->{slider}->set_range (@_) }	2847	sub set_range { shift->{slider}->set_range (@_) }
2561	sub set_value { shift->{slider}->set_value (@_) }	2848	sub set_value { shift->{slider}->set_value (@_) }
2562		2849
2563	#############################################################################	2850	#############################################################################
2564		2851
2565	package CFClient::UI::TextScroller;	2852	package CFPlus::UI::TextScroller;
2566		2853
2567	our @ISA = CFClient::UI::HBox::;	2854	our @ISA = CFPlus::UI::HBox::;
2568		2855
2569	use CFClient::OpenGL;	2856	use CFPlus::OpenGL;
2570		2857
2571	sub new {	2858	sub new {
2572	my $class = shift;	2859	my $class = shift;
2573		2860
2574	my $self = $class->SUPER::new (	2861	my $self = $class->SUPER::new (
2575	fontsize => 1,	2862	fontsize => 1,
2576	can_events => 0,	2863	can_events => 1,
2577	indent => 0,	2864	indent => 0,
2578	#font => default_font	2865	#font => default_font
2579	@_,	2866	@_,
2580		2867
2581	layout => (new CFClient::Layout),	2868	layout => (new CFPlus::Layout),
2582	par => [],	2869	par => [],
		2870	max_par => 0,
2583	height => 0,	2871	height => 0,
2584	children => [	2872	children => [
2585	(new CFClient::UI::Empty expand => 1),	2873	(new CFPlus::UI::Empty expand => 1),
2586	(new CFClient::UI::Slider vertical => 1),	2874	(new CFPlus::UI::Slider vertical => 1),
2587	],	2875	],
2588	);	2876	);
2589		2877
2590	$self->{children}[1]->connect (changed => sub { $self->update });	2878	$self->{children}[1]->connect (changed => sub { $self->update });
2591		2879
…		…
2621		2909
2622	$self->reflow;	2910	$self->reflow;
2623		2911
2624	local $self->{children} = [$empty, $slider];	2912	local $self->{children} = [$empty, $slider];
2625	$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
2626	}	2924	}
2627		2925
2628	sub get_layout {	2926	sub get_layout {
2629	my ($self, $para) = @_;	2927	my ($self, $para) = @_;
2630		2928
…		…
2658		2956
2659	# todo: base offset on lines or so, not on pixels	2957	# todo: base offset on lines or so, not on pixels
2660	$self->{children}[1]->set_value ($offset);	2958	$self->{children}[1]->set_value ($offset);
2661	}	2959	}
2662		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
2663	sub clear {	2976	sub clear {
2664	my ($self) = @_;	2977	my ($self) = @_;
2665		2978
2666	my (undef, undef, @other) = @{ $self->{children} };	2979	my (undef, undef, @other) = @{ $self->{children} };
2667	$self->remove ($_) for @other;	2980	$self->remove ($_) for @other;
…		…
2670	$self->{height} = 0;	2983	$self->{height} = 0;
2671	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2984	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2672	}	2985	}
2673		2986
2674	sub add_paragraph {	2987	sub add_paragraph {
2675	my ($self, $color, $para, $indent) = @_;	2988	my $self = shift;
2676		2989
2677	my ($text, @w) = ref $para ? @$para : $para;	2990	for my $para (@_) {
2678
2679	$para = {	2991	$para = {
		2992	fg => [1, 1, 1, 1],
		2993	indent => 0,
		2994	markup => "",
		2995	widget => [],
		2996	ref $para ? %$para : (markup => $para),
2680	w => 1e10,	2997	w => 1e10,
2681	wrapped => 1,	2998	wrapped => 1,
2682	fg => $color,
2683	indent => $indent,
2684	markup => $text,
2685	widget => \@w,
2686	};	2999	};
2687		3000
2688	$self->add (@w) if @w;	3001	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2689	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	}
2690		3008
2691	$self->{need_reflow}++;	3009	$self->{need_reflow}++;
2692	$self->update;	3010	$self->update;
2693	}	3011	}
2694		3012
2695	sub scroll_to_bottom {	3013	sub scroll_to_bottom {
2696	my ($self) = @_;	3014	my ($self) = @_;
2697		3015
2698	$self->{scroll_to_bottom} = 1;	3016	$self->{scroll_to} = $#{$self->{par}};
2699	$self->update;	3017	$self->update;
2700	}	3018	}
2701		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
2702	sub update {	3053	sub update {
2703	my ($self) = @_;	3054	my ($self) = @_;
2704		3055
2705	$self->SUPER::update;	3056	$self->SUPER::update;
2706		3057
2707	return unless $self->{h} > 0;	3058	return unless $self->{h} > 0;
2708		3059
2709	delete $self->{texture};	3060	delete $self->{texture};
2710		3061
2711	$ROOT->on_post_alloc ($self => sub {	3062	$ROOT->on_post_alloc ($self => sub {
		3063	$self->force_uptodate;
		3064
2712	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3065	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2713		3066
2714	if (delete $self->{need_reflow}) {
2715	my $height = 0;
2716
2717	for my $para (@{$self->{par}}) {
2718	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2719	my $layout = $self->get_layout ($para);
2720	my ($w, $h) = $layout->size;
2721
2722	$para->{w} = $w + $para->{indent};
2723	$para->{h} = $h;
2724	$para->{wrapped} = $layout->has_wrapped;
2725	}
2726
2727	$height += $para->{h};
2728	}
2729
2730	$self->{height} = $height;
2731
2732	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2733
2734	delete $self->{texture};
2735	}
2736
2737	if (delete $self->{scroll_to_bottom}) {
2738	$self->{children}[1]->set_value (1e10);
2739	}
2740
2741	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3067	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2742	glClearColor 0, 0, 0, 0;	3068	glClearColor 0, 0, 0, 0;
2743	glClear GL_COLOR_BUFFER_BIT;	3069	glClear GL_COLOR_BUFFER_BIT;
2744		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;
2745	my $top = int $self->{children}[1]{range}[0];	3079	my $top = int $self->{children}[1]{range}[0];
2746		3080
2747	my $y0 = $top;	3081	my $y0 = $top;
2748	my $y1 = $top + $H;	3082	my $y1 = $top + $H;
2749		3083
2750	my $y = 0;
2751
2752	for my $para (@{$self->{par}}) {	3084	for my $para (@{$self->{par}}) {
2753	my $h = $para->{h};	3085	my $h = $para->{h};
		3086	my $y = $para->{y};
2754		3087
2755	if ($y0 < $y + $h && $y < $y1) {	3088	if ($y0 < $y + $h && $y < $y1) {
2756
2757	my $layout = $self->get_layout ($para);	3089	my $layout = $self->get_layout ($para);
2758		3090
2759	$layout->render ($para->{indent}, $y - $y0);	3091	$layout->render ($para->{indent}, $y - $y0);
2760		3092
2761	if (my @w = @{ $para->{widget} }) {	3093	if (my @w = @{ $para->{widget} }) {
…		…
2770	$_->draw;	3102	$_->draw;
2771	}	3103	}
2772	}	3104	}
2773	}	3105	}
2774		3106
2775	$y += $h;	3107	$paridx++;
		3108	$top_paragraph ||= $paridx if $y >= $top;
2776	}	3109	}
		3110
		3111	$self->{top_paragraph} = $top_paragraph;
2777	};	3112	};
2778	});	3113	});
2779	}	3114	}
2780		3115
2781	sub reconfigure {	3116	sub reconfigure {
…		…
2799	$self->{children}[1]->draw;	3134	$self->{children}[1]->draw;
2800	}	3135	}
2801		3136
2802	#############################################################################	3137	#############################################################################
2803		3138
2804	package CFClient::UI::Animator;	3139	package CFPlus::UI::Animator;
2805		3140
2806	use CFClient::OpenGL;	3141	use CFPlus::OpenGL;
2807		3142
2808	our @ISA = CFClient::UI::Bin::;	3143	our @ISA = CFPlus::UI::Bin::;
2809		3144
2810	sub moveto {	3145	sub moveto {
2811	my ($self, $x, $y) = @_;	3146	my ($self, $x, $y) = @_;
2812		3147
2813	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3148	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2841	glPopMatrix;	3176	glPopMatrix;
2842	}	3177	}
2843		3178
2844	#############################################################################	3179	#############################################################################
2845		3180
2846	package CFClient::UI::Flopper;	3181	package CFPlus::UI::Flopper;
2847		3182
2848	our @ISA = CFClient::UI::Button::;	3183	our @ISA = CFPlus::UI::Button::;
2849		3184
2850	sub new {	3185	sub new {
2851	my $class = shift;	3186	my $class = shift;
2852		3187
2853	my $self = $class->SUPER::new (	3188	my $self = $class->SUPER::new (
…		…
2865	$self->{other}->toggle_visibility;	3200	$self->{other}->toggle_visibility;
2866	}	3201	}
2867		3202
2868	#############################################################################	3203	#############################################################################
2869		3204
2870	package CFClient::UI::Tooltip;	3205	package CFPlus::UI::Tooltip;
2871		3206
2872	our @ISA = CFClient::UI::Bin::;	3207	our @ISA = CFPlus::UI::Bin::;
2873		3208
2874	use CFClient::OpenGL;	3209	use CFPlus::OpenGL;
2875		3210
2876	sub new {	3211	sub new {
2877	my $class = shift;	3212	my $class = shift;
2878		3213
2879	$class->SUPER::new (	3214	$class->SUPER::new (
…		…
2882	)	3217	)
2883	}	3218	}
2884		3219
2885	sub set_tooltip_from {	3220	sub set_tooltip_from {
2886	my ($self, $widget) = @_;	3221	my ($self, $widget) = @_;
		3222
		3223	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3224	if $widget->{tooltip} =~ /^#(.*)$/;
2887		3225
2888	my $tooltip = $widget->{tooltip};	3226	my $tooltip = $widget->{tooltip};
2889		3227
2890	if ($ENV{CFPLUS_DEBUG} & 2) {	3228	if ($ENV{CFPLUS_DEBUG} & 2) {
2891	$tooltip .= "\n\n" . (ref $widget) . "\n"	3229	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2895	}	3233	}
2896		3234
2897	$tooltip =~ s/^\n+//;	3235	$tooltip =~ s/^\n+//;
2898	$tooltip =~ s/\n+$//;	3236	$tooltip =~ s/\n+$//;
2899		3237
2900	$self->add (new CFClient::UI::Label	3238	$self->add (new CFPlus::UI::Label
2901	markup => $tooltip,	3239	markup => $tooltip,
2902	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3240	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2903	fontsize => 0.8,	3241	fontsize => 0.8,
2904	fg => [0, 0, 0, 1],	3242	style => 1, # FLAG_INVERSE
2905	ellipsise => 0,	3243	ellipsise => 0,
2906	font => ($widget->{tooltip_font} || $::FONT_PROP),	3244	font => ($widget->{tooltip_font} || $::FONT_PROP),
2907	);	3245	);
2908	}	3246	}
2909		3247
…		…
2928		3266
2929	$self->{root}->on_post_alloc ("move_$self" => sub {	3267	$self->{root}->on_post_alloc ("move_$self" => sub {
2930	my $widget = $self->{owner}	3268	my $widget = $self->{owner}
2931	or return;	3269	or return;
2932		3270
		3271	if ($widget->{visible}) {
2933	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3272	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2934		3273
2935	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3274	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2936	if $x + $self->{w} > $self->{root}{w};	3275	if $x + $self->{w} > $self->{root}{w};
2937		3276
2938	$self->move_abs ($x, $y);	3277	$self->move_abs ($x, $y);
		3278	} else {
		3279	$self->hide;
		3280	}
2939	});	3281	});
2940	}	3282	}
2941		3283
2942	sub _draw {	3284	sub _draw {
2943	my ($self) = @_;	3285	my ($self) = @_;
…		…
2967	$self->SUPER::_draw;	3309	$self->SUPER::_draw;
2968	}	3310	}
2969		3311
2970	#############################################################################	3312	#############################################################################
2971		3313
2972	package CFClient::UI::Face;	3314	package CFPlus::UI::Face;
2973		3315
2974	our @ISA = CFClient::UI::Base::;	3316	our @ISA = CFPlus::UI::DrawBG::;
2975		3317
2976	use CFClient::OpenGL;	3318	use CFPlus::OpenGL;
2977		3319
2978	sub new {	3320	sub new {
2979	my $class = shift;	3321	my $class = shift;
2980		3322
2981	my $self = $class->SUPER::new (	3323	my $self = $class->SUPER::new (
…		…
2983	can_events => 0,	3325	can_events => 0,
2984	@_,	3326	@_,
2985	);	3327	);
2986		3328
2987	if ($self->{anim} && $self->{animspeed}) {	3329	if ($self->{anim} && $self->{animspeed}) {
2988	Scalar::Util::weaken (my $widget = $self);	3330	CFPlus::weaken (my $widget = $self);
2989		3331
2990	$self->{timer} = Event->timer (	3332	$self->{timer} = Event->timer (
2991	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3333	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2992	hard => 1,	3334	hard => 1,
2993	interval => $self->{animspeed},	3335	interval => $self->{animspeed},
…		…
3016	sub _draw {	3358	sub _draw {
3017	my ($self) = @_;	3359	my ($self) = @_;
3018		3360
3019	return unless $::CONN;	3361	return unless $::CONN;
3020		3362
		3363	$self->SUPER::_draw;
		3364
3021	my $face;	3365	my $face;
3022		3366
3023	if ($self->{frame}) {	3367	if ($self->{frame}) {
3024	my $anim = $::CONN->{anim}[$self->{anim}];	3368	my $anim = $::CONN->{anim}[$self->{anim}];
3025		3369
…		…
3047	$self->SUPER::destroy;	3391	$self->SUPER::destroy;
3048	}	3392	}
3049		3393
3050	#############################################################################	3394	#############################################################################
3051		3395
3052	package CFClient::UI::Buttonbar;	3396	package CFPlus::UI::Buttonbar;
3053		3397
3054	our @ISA = CFClient::UI::HBox::;	3398	our @ISA = CFPlus::UI::HBox::;
3055		3399
3056	# TODO: should actualyl wrap buttons and other goodies.	3400	# TODO: should actually wrap buttons and other goodies.
3057		3401
3058	#############################################################################	3402	#############################################################################
3059		3403
3060	package CFClient::UI::Menu;	3404	package CFPlus::UI::Menu;
3061		3405
3062	our @ISA = CFClient::UI::FancyFrame::;	3406	our @ISA = CFPlus::UI::Toplevel::;
3063		3407
3064	use CFClient::OpenGL;	3408	use CFPlus::OpenGL;
3065		3409
3066	sub new {	3410	sub new {
3067	my $class = shift;	3411	my $class = shift;
3068		3412
3069	my $self = $class->SUPER::new (	3413	my $self = $class->SUPER::new (
3070	items => [],	3414	items => [],
3071	z => 100,	3415	z => 100,
3072	@_,	3416	@_,
3073	);	3417	);
3074		3418
3075	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3419	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3076		3420
3077	for my $item (@{ $self->{items} }) {	3421	for my $item (@{ $self->{items} }) {
3078	my ($widget, $cb, $tooltip) = @$item;	3422	my ($widget, $cb, $tooltip) = @$item;
3079		3423
3080	# handle various types of items, only text for now	3424	# handle various types of items, only text for now
3081	if (!ref $widget) {	3425	if (!ref $widget) {
3082	if ($widget =~ /\t/) {	3426	if ($widget =~ /\t/) {
3083	my ($left, $right) = split /\t/, $widget, 2;	3427	my ($left, $right) = split /\t/, $widget, 2;
3084		3428
3085	$widget = new CFClient::UI::HBox	3429	$widget = new CFPlus::UI::HBox
3086	can_hover => 1,	3430	can_hover => 1,
3087	can_events => 1,	3431	can_events => 1,
3088	tooltip => $tooltip,	3432	tooltip => $tooltip,
3089	children => [	3433	children => [
3090	(new CFClient::UI::Label markup => $left, expand => 1),	3434	(new CFPlus::UI::Label markup => $left, expand => 1),
3091	(new CFClient::UI::Label markup => $right, align => +1),	3435	(new CFPlus::UI::Label markup => $right, align => +1),
3092	],	3436	],
3093	;	3437	;
3094		3438
3095	} else {	3439	} else {
3096	$widget = new CFClient::UI::Label	3440	$widget = new CFPlus::UI::Label
3097	can_hover => 1,	3441	can_hover => 1,
3098	can_events => 1,	3442	can_events => 1,
3099	markup => $widget,	3443	markup => $widget,
3100	tooltip => $tooltip;	3444	tooltip => $tooltip;
3101	}	3445	}
…		…
3149	1	3493	1
3150	}	3494	}
3151		3495
3152	#############################################################################	3496	#############################################################################
3153		3497
3154	package CFClient::UI::Multiplexer;	3498	package CFPlus::UI::Multiplexer;
3155		3499
3156	our @ISA = CFClient::UI::Container::;	3500	our @ISA = CFPlus::UI::Container::;
3157		3501
3158	sub new {	3502	sub new {
3159	my $class = shift;	3503	my $class = shift;
3160		3504
3161	my $self = $class->SUPER::new (	3505	my $self = $class->SUPER::new (
…		…
3222	$self->{current}->draw;	3566	$self->{current}->draw;
3223	}	3567	}
3224		3568
3225	#############################################################################	3569	#############################################################################
3226		3570
3227	package CFClient::UI::Notebook;	3571	package CFPlus::UI::Notebook;
3228		3572
3229	our @ISA = CFClient::UI::VBox::;	3573	our @ISA = CFPlus::UI::VBox::;
3230		3574
3231	sub new {	3575	sub new {
3232	my $class = shift;	3576	my $class = shift;
3233		3577
3234	my $self = $class->SUPER::new (	3578	my $self = $class->SUPER::new (
3235	buttonbar => (new CFClient::UI::Buttonbar),	3579	buttonbar => (new CFPlus::UI::Buttonbar),
3236	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3580	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3237	# filter => # will be put between multiplexer and $self	3581	# filter => # will be put between multiplexer and $self
3238	@_,	3582	@_,
3239	);	3583	);
3240		3584
3241	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3585	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3245	}	3589	}
3246		3590
3247	sub add {	3591	sub add {
3248	my ($self, $title, $widget, $tooltip) = @_;	3592	my ($self, $title, $widget, $tooltip) = @_;
3249		3593
3250	Scalar::Util::weaken $self;	3594	CFPlus::weaken $self;
3251		3595
3252	$self->{buttonbar}->add (new CFClient::UI::Button	3596	$self->{buttonbar}->add (new CFPlus::UI::Button
3253	markup => $title,	3597	markup => $title,
3254	tooltip => $tooltip,	3598	tooltip => $tooltip,
3255	on_activate => sub { $self->set_current_page ($widget) },	3599	on_activate => sub { $self->set_current_page ($widget) },
3256	);	3600	);
3257		3601
…		…
3271	$self->emit (page_changed => $self->{multiplexer}{current});	3615	$self->emit (page_changed => $self->{multiplexer}{current});
3272	}	3616	}
3273		3617
3274	#############################################################################	3618	#############################################################################
3275		3619
3276	package CFClient::UI::Combobox;	3620	package CFPlus::UI::Selector;
3277		3621
3278	use utf8;	3622	use utf8;
3279		3623
3280	our @ISA = CFClient::UI::Button::;	3624	our @ISA = CFPlus::UI::Button::;
3281		3625
3282	sub new {	3626	sub new {
3283	my $class = shift;	3627	my $class = shift;
3284		3628
3285	my $self = $class->SUPER::new (	3629	my $self = $class->SUPER::new (
…		…
3302	my ($value, $title, $tooltip) = @$_;	3646	my ($value, $title, $tooltip) = @$_;
3303		3647
3304	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3648	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3305	}	3649	}
3306		3650
3307	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3651	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3308	}	3652	}
3309		3653
3310	sub _set_value {	3654	sub _set_value {
3311	my ($self, $value) = @_;	3655	my ($self, $value) = @_;
3312		3656
…		…
3327	$self->emit (changed => $value);	3671	$self->emit (changed => $value);
3328	}	3672	}
3329		3673
3330	#############################################################################	3674	#############################################################################
3331		3675
3332	package CFClient::UI::Statusbox;	3676	package CFPlus::UI::Statusbox;
3333		3677
3334	our @ISA = CFClient::UI::VBox::;	3678	our @ISA = CFPlus::UI::VBox::;
3335		3679
3336	sub new {	3680	sub new {
3337	my $class = shift;	3681	my $class = shift;
3338		3682
3339	my $self = $class->SUPER::new (	3683	my $self = $class->SUPER::new (
3340	fontsize => 0.8,	3684	fontsize => 0.8,
3341	@_,	3685	@_,
3342	);	3686	);
3343		3687
3344	Scalar::Util::weaken (my $this = $self);	3688	CFPlus::weaken (my $this = $self);
3345		3689
3346	$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 });
3347		3691
3348	$self	3692	$self
3349	}	3693	}
…		…
3351	sub reorder {	3695	sub reorder {
3352	my ($self) = @_;	3696	my ($self) = @_;
3353	my $NOW = Time::HiRes::time;	3697	my $NOW = Time::HiRes::time;
3354		3698
3355	# freeze display when hovering over any label	3699	# freeze display when hovering over any label
3356	return if $CFClient::UI::TOOLTIP->{owner}	3700	return if $CFPlus::UI::TOOLTIP->{owner}
3357	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3701	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3358	values %{ $self->{item} };	3702	values %{ $self->{item} };
3359		3703
3360	while (my ($k, $v) = each %{ $self->{item} }) {	3704	while (my ($k, $v) = each %{ $self->{item} }) {
3361	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3705	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3362	}	3706	}
…		…
3383	for ($short) {	3727	for ($short) {
3384	s/^\s+//;	3728	s/^\s+//;
3385	s/\s+/ /g;	3729	s/\s+/ /g;
3386	}	3730	}
3387		3731
3388	new CFClient::UI::Label	3732	new CFPlus::UI::Label
3389	markup => $short,	3733	markup => $short,
3390	tooltip => $item->{tooltip},	3734	tooltip => $item->{tooltip},
3391	tooltip_font => $::FONT_PROP,	3735	tooltip_font => $::FONT_PROP,
3392	tooltip_width => 0.67,	3736	tooltip_width => 0.67,
3393	fontsize => $item->{fontsize} || $self->{fontsize},	3737	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3472	$self->SUPER::destroy;	3816	$self->SUPER::destroy;
3473	}	3817	}
3474		3818
3475	#############################################################################	3819	#############################################################################
3476		3820
3477	package CFClient::UI::Inventory;
3478
3479	our @ISA = CFClient::UI::Table::;
3480
3481	sub new {
3482	my $class = shift;
3483
3484	my $self = $class->SUPER::new (
3485	col_expand => [0, 1, 0],
3486	@_,
3487	);
3488
3489	$self
3490	}
3491
3492	sub set_items {
3493	my ($self, $items) = @_;
3494
3495	$self->clear;
3496	return unless $items;
3497
3498	my @items = sort {
3499	($a->{type} <=> $b->{type})
3500	or ($a->{name} cmp $b->{name})
3501	} values %$items;
3502
3503	$self->{real_items} = \@items;
3504
3505	my $row = 0;
3506	for my $item (@items) {
3507	CFClient::Item::update_widgets $item;
3508
3509	$self->add (0, $row, $item->{face_widget});
3510	$self->add (1, $row, $item->{desc_widget});
3511	$self->add (2, $row, $item->{weight_widget});
3512
3513	$row++;
3514	}
3515	}
3516
3517	#############################################################################
3518
3519	package CFClient::UI::SpellList;
3520
3521	our @ISA = CFClient::UI::Table::;
3522
3523	sub new {
3524	my $class = shift;
3525
3526	my $self = $class->SUPER::new (
3527	binding => [],
3528	commands => [],
3529	@_,
3530	)
3531	}
3532
3533	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3534
3535	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3537	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3538	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3539	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3541	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3543	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3544	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3545
3546	sub rebuild_spell_list {
3547	my ($self) = @_;
3548
3549	$CFClient::UI::ROOT->on_refresh ($self => sub {
3550	$self->clear;
3551
3552	return unless $::CONN;
3553
3554	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3555	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3556	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3557	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3558	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3559
3560	my $row = 0;
3561
3562	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3563	my $spell = $self->{spell}{$_};
3564
3565	$row++;
3566
3567	my $spell_cb = sub {
3568	my ($widget, $ev) = @_;
3569
3570	if ($ev->{button} == 1) {
3571	$::CONN->user_send ("cast $spell->{name}");
3572	} elsif ($ev->{button} == 2) {
3573	$::CONN->user_send ("invoke $spell->{name}");
3574	} elsif ($ev->{button} == 3) {
3575	(new CFClient::UI::Menu
3576	items => [
3577	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3578	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3579	],
3580	)->popup ($ev);
3581	} else {
3582	return 0;
3583	}
3584
3585	1
3586	};
3587
3588	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3589
3590	#TODO: add path info to tooltip
3591	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3592
3593	$self->add (0, $row, new CFClient::UI::Face
3594	face => $spell->{face},
3595	can_hover => 1,
3596	can_events => 1,
3597	tooltip => $tooltip,
3598	on_button_down => $spell_cb,
3599	);
3600
3601	$self->add (1, $row, new CFClient::UI::Label
3602	expand => 1,
3603	text => $spell->{name},
3604	can_hover => 1,
3605	can_events => 1,
3606	tooltip => $tooltip,
3607	on_button_down => $spell_cb,
3608	);
3609
3610	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3611	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3612	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3613	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3614	}
3615	});
3616	}
3617
3618	sub add_spell {
3619	my ($self, $spell) = @_;
3620
3621	$self->{spell}->{$spell->{name}} = $spell;
3622	$self->rebuild_spell_list;
3623	}
3624
3625	sub remove_spell {
3626	my ($self, $spell) = @_;
3627
3628	delete $self->{spell}->{$spell->{name}};
3629	$self->rebuild_spell_list;
3630	}
3631
3632	sub clear_spells {
3633	my ($self) = @_;
3634
3635	$self->{spell} = {};
3636	$self->rebuild_spell_list;
3637	}
3638
3639	#############################################################################
3640
3641	package CFClient::UI::Root;	3821	package CFPlus::UI::Root;
3642		3822
3643	our @ISA = CFClient::UI::Container::;	3823	our @ISA = CFPlus::UI::Container::;
3644		3824
3645	use List::Util qw(min max);	3825	use List::Util qw(min max);
3646		3826
3647	use CFClient::OpenGL;	3827	use CFPlus::OpenGL;
3648		3828
3649	sub new {	3829	sub new {
3650	my $class = shift;	3830	my $class = shift;
3651		3831
3652	my $self = $class->SUPER::new (	3832	my $self = $class->SUPER::new (
3653	visible => 1,	3833	visible => 1,
3654	@_,	3834	@_,
3655	);	3835	);
3656		3836
3657	Scalar::Util::weaken ($self->{root} = $self);	3837	CFPlus::weaken ($self->{root} = $self);
3658		3838
3659	$self	3839	$self
3660	}	3840	}
3661		3841
3662	sub size_request {	3842	sub size_request {
…		…
3831	$h = 0 if $h < 0;	4011	$h = 0 if $h < 0;
3832		4012
3833	$w = max $widget->{min_w}, $w;	4013	$w = max $widget->{min_w}, $w;
3834	$h = max $widget->{min_h}, $h;	4014	$h = max $widget->{min_h}, $h;
3835		4015
		4016	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4017	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4018
3836	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4019	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4020	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838		4021
3839	$w = int $w + 0.5;	4022	$w = int $w + 0.5;
3840	$h = int $h + 0.5;	4023	$h = int $h + 0.5;
…		…
3866	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4049	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3867	glMatrixMode GL_MODELVIEW;	4050	glMatrixMode GL_MODELVIEW;
3868	glLoadIdentity;	4051	glLoadIdentity;
3869		4052
3870	{	4053	{
3871	package CFClient::UI::Base;	4054	package CFPlus::UI::Base;
3872		4055
3873	($draw_x, $draw_y, $draw_w, $draw_h) =	4056	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3874	(0, 0, $self->{w}, $self->{h});	4057	(0, 0, $self->{w}, $self->{h});
3875	}
3876		4058
3877	$self->_draw;	4059	$self->_draw;
		4060	}
3878	}	4061	}
3879		4062
3880	#############################################################################	4063	#############################################################################
3881		4064
3882	package CFClient::UI;	4065	package CFPlus::UI;
3883		4066
3884	$ROOT = new CFClient::UI::Root;	4067	$ROOT = new CFPlus::UI::Root;
3885	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4068	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3886		4069
3887	1	4070	1
3888		4071

Diff Legend

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