ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.329 by root, Sun Jul 23 02:44:06 2006 UTC vs.
Revision 1.368 by root, Mon Jun 25 05:43:37 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
98		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	# mousewheel
100	if $GRAB;	118	$ev->{dx} = 0;
		119	$ev->{dy} = $ev->{button} * 2 - 9;
		120	$GRAB->emit (mouse_wheel => $ev);
		121	} else {
		122	$GRAB->emit (button_down => $ev)
		123	}
		124	}
101	}	125	}
102		126
103	sub feed_sdl_button_up_event {	127	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	128	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		129
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	130	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		131
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	132	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		133
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	134	$GRAB->emit (button_up => $ev)
112	if $GRAB;	135	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		136
114	if (!$BUTTON_STATE) {	137	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	138	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	139	$grab->update if $grab;
117	$GRAB->update if $GRAB;	140	$GRAB->update if $GRAB;
118		141
		142	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	143	$TOOLTIP_WATCHER->cb->();
120	}	144	}
121	}	145	}
122		146
123	sub feed_sdl_motion_event {	147	sub feed_sdl_motion_event {
124	my ($ev) = @_;	148	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	149	my ($x, $y) = ($ev->{x}, $ev->{y});
126		150
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	151	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		152
129	if ($widget != $HOVER) {	153	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		154
132	$hover->update if $hover && $hover->{can_hover};	155	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	156	if $HOVER;
140	}	157	}
141		158
142	# convert position array to integers	159	# convert position array to integers
143	sub harmonize {	160	sub harmonize {
…		…
193	reconfigure_widgets;	210	reconfigure_widgets;
194	}	211	}
195		212
196	#############################################################################	213	#############################################################################
197		214
		215	package CFPlus::UI::Event;
		216
		217	sub xy {
		218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		219	}
		220
		221	#############################################################################
		222
198	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
199		224
200	use strict;	225	use strict;
201		226
202	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
203		228
204	sub new {	229	sub new {
205	my $class = shift;	230	my $class = shift;
206		231
207	my $self = bless {	232	my $self = bless {
…		…
212	h => undef,	237	h => undef,
213	can_events => 1,	238	can_events => 1,
214	@_	239	@_
215	}, $class;	240	}, $class;
216		241
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		243
219	for (keys %$self) {	244	for (keys %$self) {
220	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
222	}	247	}
223	}	248	}
224		249
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	252	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	253	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		255
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		258
234	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
239		264
240	sub destroy {	265	sub destroy {
241	my ($self) = @_;	266	my ($self) = @_;
242		267
243	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
244	%$self = ();	270	%$self = ();
245	}	271	}
246		272
		273	sub TO_JSON {
		274	{ __widget_ref__ => $_[0]{s_id} }
		275	}
		276
247	sub show {	277	sub show {
248	my ($self) = @_;	278	my ($self) = @_;
249		279
250	return if $self->{parent};	280	return if $self->{parent};
251		281
252	$CFClient::UI::ROOT->add ($self);	282	$CFPlus::UI::ROOT->add ($self);
253	}	283	}
254		284
255	sub set_visible {	285	sub set_visible {
256	my ($self) = @_;	286	my ($self) = @_;
257		287
…		…
278	delete $self->{root};	308	delete $self->{root};
279		309
280	undef $GRAB if $GRAB == $self;	310	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	311	undef $HOVER if $HOVER == $self;
282		312
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	314	if $TOOLTIP->{owner} == $self;
285		315
286	$self->emit ("focus_out");	316	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
288	}	318	}
…		…
345	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
346		376
347	if ($self->{aspect}) {	377	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
349		379
350	$w = List::Util::min $w, int $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		382
353	# use alignment to adjust x, y	383	# use alignment to adjust x, y
354		384
355	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
397		427
398	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
399		429
400	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
401		431
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	435	}
406	}	436	}
407		437
408	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
409	sub coord2local {	439	sub coord2local {
410	my ($self, $x, $y) = @_;	440	my ($self, $x, $y) = @_;
411		441
		442	Carp::confess unless $self->{parent};#d#
		443
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	445	}
414		446
415	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
416	sub coord2global {	448	sub coord2global {
417	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
		450
		451	Carp::confess unless $self->{parent};#d#
418		452
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	454	}
421		455
422	sub invoke_focus_in {	456	sub invoke_focus_in {
…		…
456		490
457	sub invoke_mouse_motion { 0 }	491	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 0 }	492	sub invoke_button_up { 0 }
459	sub invoke_key_down { 0 }	493	sub invoke_key_down { 0 }
460	sub invoke_key_up { 0 }	494	sub invoke_key_up { 0 }
		495	sub invoke_mouse_wheel { 0 }
461		496
462	sub invoke_button_down {	497	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	498	my ($self, $ev, $x, $y) = @_;
464		499
465	$self->grab_focus;	500	$self->grab_focus;
…		…
469		504
470	sub connect {	505	sub connect {
471	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
472		507
473	push @{ $self->{signal_cb}{$signal} }, $cb;	508	push @{ $self->{signal_cb}{$signal} }, $cb;
		509
		510	defined wantarray and CFPlus::guard {
		511	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		512	@{ $self->{signal_cb}{$signal} };
		513	}
474	}	514	}
		515
		516	sub disconnect_all {
		517	my ($self, $signal) = @_;
		518
		519	delete $self->{signal_cb}{$signal};
		520	}
		521
		522	my %has_coords = (
		523	button_down => 1,
		524	button_up => 1,
		525	mouse_motion => 1,
		526	mouse_wheel => 1,
		527	);
475		528
476	sub emit {	529	sub emit {
477	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
478		531
		532	# I do not really like this solution, but I do not like duplication
		533	# and needlessly verbose code, either.
		534	my @append
		535	= $has_coords{$signal}
		536	? $args[0]->xy ($self)
		537	: ();
		538
479	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480		540
481	#d##TODO# stop propagating at first true, do not use sum	541	for my $cb (
482	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	542	@{$self->{signal_cb}{$signal} || []}, # before
483	|| ($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
484	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
485	}	550	}
486		551
487	sub find_widget {	552	sub find_widget {
488	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
489		554
…		…
497	}	562	}
498		563
499	sub set_parent {	564	sub set_parent {
500	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
501		566
502	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
503	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
504	}	569	}
505		570
506	sub realloc {	571	sub realloc {
507	my ($self) = @_;	572	my ($self) = @_;
…		…
573	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
574	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
575	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
576	glEnd;	641	glEnd;
577	glPopMatrix;	642	glPopMatrix;
578	#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;
579	}	644	}
580		645
581	$self->_draw;	646	$self->_draw;
582	glPopMatrix;	647	glPopMatrix;
583	}	648	}
…		…
586	my ($self) = @_;	651	my ($self) = @_;
587		652
588	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
589	}	654	}
590		655
		656	my $cntx;#d#
591	sub DESTROY {	657	sub DESTROY {
592	my ($self) = @_;	658	my ($self) = @_;
593		659
594	return if CFClient::in_destruct;	660	return if CFPlus::in_destruct;
595
596	delete $WIDGET{$self+0};
597		661
598	eval { $self->destroy };	662	eval { $self->destroy };
599	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};
600	}	666	}
601		667
602	#############################################################################	668	#############################################################################
603		669
604	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
605		671
606	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
607		673
608	use strict;	674	use strict;
609	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
610		676
611	sub new {	677	sub new {
612	my $class = shift;	678	my $class = shift;
613		679
614	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
645	}	711	}
646	}	712	}
647		713
648	#############################################################################	714	#############################################################################
649		715
650	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
651		717
652	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
653		719
654	sub new {	720	sub new {
655	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
656	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
657	}	723	}
…		…
664		730
665	sub draw { }	731	sub draw { }
666		732
667	#############################################################################	733	#############################################################################
668		734
669	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
670		736
671	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
672		738
673	sub new {	739	sub new {
674	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
675		741
676	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
685	if $children;	751	if $children;
686		752
687	$self	753	$self
688	}	754	}
689		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
690	sub add {	764	sub add {
691	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
692		766
693	$_->set_parent ($self)	767	$_->set_parent ($self)
694	for @widgets;	768	for @widgets;
…		…
754	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
755	}	829	}
756		830
757	#############################################################################	831	#############################################################################
758		832
759	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
760		834
761	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
762		836
763	sub new {	837	sub new {
764	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
765		839
766	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
767		841
768	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
769	}	843	}
770		844
771	sub add {	845	sub add {
…		…
778	sub remove {	852	sub remove {
779	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
780		854
781	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
782		856
783	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
784	unless @{$self->{children}};	858	unless @{$self->{children}};
785	}	859	}
786		860
787	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
788		862
…		…
800		874
801	#############################################################################	875	#############################################################################
802		876
803	# back-buffered drawing area	877	# back-buffered drawing area
804		878
805	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
806		880
807	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
808		882
809	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
810		884
811	sub new {	885	sub new {
812	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
813		887
814	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
836	}	910	}
837		911
838	sub render_child {	912	sub render_child {
839	my ($self) = @_;	913	my ($self) = @_;
840		914
841	$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 {
842	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
843	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
844		918
845	{	919	{
846	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
847		921
848	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
849	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
850	}	926	}
851
852	$self->_render;
853	};	927	};
854	}	928	}
855		929
856	sub _draw {	930	sub _draw {
857	my ($self) = @_;	931	my ($self) = @_;
858
859	my ($w, $h) = @$self{qw(w h)};
860		932
861	my $tex = $self->{texture}	933	my $tex = $self->{texture}
862	or return;	934	or return;
863		935
864	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
865	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
866	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
867		939
868	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
869		941
870	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
871	}	943	}
872		944
873	#############################################################################	945	#############################################################################
874		946
875	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
876		948
877	our @ISA = CFClient::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
878		950
879	sub new {	951	sub new {
880	my $class = shift;	952	my $class = shift;
881		953
882	$class->SUPER::new (	954	$class->SUPER::new (
…		…
942	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
943	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
944	) {	1016	) {
945	$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})
946	} else {	1018	} else {
947	$self->CFClient::UI::Base::find_widget ($x, $y)	1019	$self->CFPlus::UI::Base::find_widget ($x, $y)
948	}	1020	}
949	}	1021	}
950		1022
951	sub _render {	1023	sub _render {
952	my ($self) = @_;	1024	my ($self) = @_;
953		1025
954	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};
955	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};
956		1028
957	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1029	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
958		1030
959	$self->SUPER::_render;	1031	$self->SUPER::_render;
960	}	1032	}
961		1033
962	#############################################################################	1034	#############################################################################
963		1035
964	package CFClient::UI::ScrolledWindow;	1036	package CFPlus::UI::ScrolledWindow;
965		1037
966	our @ISA = CFClient::UI::HBox::;	1038	our @ISA = CFPlus::UI::HBox::;
967		1039
968	sub new {	1040	sub new {
969	my ($class, %arg) = @_;	1041	my ($class, %arg) = @_;
970		1042
971	my $child = delete $arg{child};	1043	my $child = delete $arg{child};
972		1044
973	my $self;	1045	my $self;
974		1046
975	my $slider = new CFClient::UI::Slider	1047	my $slider = new CFPlus::UI::Slider
976	vertical => 1,	1048	vertical => 1,
977	range => [0, 0, 1, 0.01], # HACK fix	1049	range => [0, 0, 1, 0.01], # HACK fix
978	on_changed => sub {	1050	on_changed => sub {
979	$self->{vp}->set_offset (0, $_[1]);	1051	$self->{vp}->set_offset (0, $_[1]);
980	},	1052	},
981	;	1053	;
982		1054
983	$self = $class->SUPER::new (	1055	$self = $class->SUPER::new (
984	vp => (new CFClient::UI::ViewPort expand => 1),	1056	vp => (new CFPlus::UI::ViewPort expand => 1),
		1057	can_events => 1,
985	slider => $slider,	1058	slider => $slider,
986	%arg,	1059	%arg,
987	);	1060	);
988		1061
989	$self->SUPER::add ($self->{vp}, $self->{slider});	1062	$self->SUPER::add ($self->{vp}, $self->{slider});
990	$self->add ($child) if $child;	1063	$self->add ($child) if $child;
…		…
998	my ($self, $widget) = @_;	1071	my ($self, $widget) = @_;
999		1072
1000	$self->{vp}->add ($self->{child} = $widget);	1073	$self->{vp}->add ($self->{child} = $widget);
1001	}	1074	}
1002		1075
1003	sub invoke_button_up {	1076	sub invoke_mouse_wheel {
1004	my ($self, $ev) = @_;	1077	my ($self, $ev) = @_;
1005		1078
1006	warn "button up $ev->{button}\n";#d#	1079	return 0 unless $ev->{dy}; # only vertical movements
		1080
		1081	$self->{slider}->emit (mouse_wheel => $ev);
		1082
1007		1083	1
1008	0
1009	}	1084	}
1010		1085
1011	sub update_slider {	1086	sub update_slider {
1012	my ($self) = @_;	1087	my ($self) = @_;
1013		1088
…		…
1030	$self->SUPER::invoke_size_allocate ($w, $h)	1105	$self->SUPER::invoke_size_allocate ($w, $h)
1031	}	1106	}
1032		1107
1033	#############################################################################	1108	#############################################################################
1034		1109
1035	package CFClient::UI::Frame;	1110	package CFPlus::UI::Frame;
1036		1111
1037	our @ISA = CFClient::UI::Bin::;	1112	our @ISA = CFPlus::UI::Bin::;
1038		1113
1039	use CFClient::OpenGL;	1114	use CFPlus::OpenGL;
1040		1115
1041	sub new {	1116	sub new {
1042	my $class = shift;	1117	my $class = shift;
1043		1118
1044	$class->SUPER::new (	1119	$class->SUPER::new (
…		…
1070	$self->SUPER::_draw;	1145	$self->SUPER::_draw;
1071	}	1146	}
1072		1147
1073	#############################################################################	1148	#############################################################################
1074		1149
1075	package CFClient::UI::FancyFrame;	1150	package CFPlus::UI::FancyFrame;
1076		1151
1077	our @ISA = CFClient::UI::Bin::;	1152	our @ISA = CFPlus::UI::Bin::;
1078		1153
1079	use CFClient::OpenGL;	1154	use CFPlus::OpenGL;
		1155
		1156	sub new {
		1157	my ($class, %arg) = @_;
		1158
		1159	if ((exists $arg{label}) && !ref $arg{label}) {
		1160	$arg{label} = new CFPlus::UI::Label
		1161	align => 1,
		1162	valign => 0,
		1163	text => $arg{label},
		1164	fontsize => ($arg{border} || 0.8) * 0.75;
		1165	}
		1166
		1167	my $self = $class->SUPER::new (
		1168	# label => "",
		1169	fg => [0.6, 0.3, 0.1],
		1170	border => 0.8,
		1171	style => 'single',
		1172	%arg,
		1173	);
		1174
		1175	$self
		1176	}
		1177
		1178	sub add {
		1179	my ($self, @widgets) = @_;
		1180
		1181	$self->SUPER::add (@widgets);
		1182	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1183	}
		1184
		1185	sub border {
		1186	int $_[0]{border} * $::FONTSIZE
		1187	}
		1188
		1189	sub size_request {
		1190	my ($self) = @_;
		1191
		1192	($self->{label_w}, undef) = $self->{label}->size_request
		1193	if $self->{label};
		1194
		1195	my ($w, $h) = $self->SUPER::size_request;
		1196
		1197	(
		1198	$w + $self->border * 2,
		1199	$h + $self->border * 2,
		1200	)
		1201	}
		1202
		1203	sub invoke_size_allocate {
		1204	my ($self, $w, $h) = @_;
		1205
		1206	my $border = $self->border;
		1207
		1208	$w -= List::Util::max 0, $border * 2;
		1209	$h -= List::Util::max 0, $border * 2;
		1210
		1211	if (my $label = $self->{label}) {
		1212	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1213	$label->{h} = List::Util::min $h, $border;
		1214	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1215	}
		1216
		1217	$self->child->configure ($border, $border, $w, $h);
		1218
		1219	1
		1220	}
		1221
		1222	sub _draw {
		1223	my ($self) = @_;
		1224
		1225	my $child = $self->{children}[0];
		1226
		1227	my $border = $self->border;
		1228	my ($w, $h) = ($self->{w}, $self->{h});
		1229
		1230	$child->draw;
		1231
		1232	glColor @{$self->{fg}};
		1233	glBegin GL_LINE_STRIP;
		1234	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1235	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1236	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1237	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1238	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1239	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1240	glEnd;
		1241
		1242	if ($self->{label}) {
		1243	glTranslate $border * 2, 0;
		1244	$self->{label}->_draw;
		1245	}
		1246	}
		1247
		1248	#############################################################################
		1249
		1250	package CFPlus::UI::Toplevel;
		1251
		1252	our @ISA = CFPlus::UI::Bin::;
		1253
		1254	use CFPlus::OpenGL;
1080		1255
1081	my $bg =	1256	my $bg =
1082	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1257	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1083	mipmap => 1, wrap => 1;	1258	mipmap => 1, wrap => 1;
1084		1259
1085	my @border =	1260	my @border =
1086	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1261	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1087	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1262	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1088		1263
1089	sub new {	1264	sub new {
1090	my ($class, %arg) = @_;	1265	my ($class, %arg) = @_;
1091		1266
…		…
1097	min_w => 64,	1272	min_w => 64,
1098	min_h => 32,	1273	min_h => 32,
1099	%arg,	1274	%arg,
1100	);	1275	);
1101		1276
1102	$self->{title_widget} = new CFClient::UI::Label	1277	$self->{title_widget} = new CFPlus::UI::Label
1103	align => 0,	1278	align => 0,
1104	valign => 1,	1279	valign => 1,
1105	text => $self->{title},	1280	text => $self->{title},
1106	fontsize => $self->{border},	1281	fontsize => $self->{border},
1107	if exists $self->{title};	1282	if exists $self->{title};
1108		1283
1109	if ($self->{has_close_button}) {	1284	if ($self->{has_close_button}) {
1110	$self->{close_button} =	1285	$self->{close_button} =
1111	new CFClient::UI::ImageButton	1286	new CFPlus::UI::ImageButton
1112	path => 'x1_close.png',	1287	path => 'x1_close.png',
1113	on_activate => sub { $self->emit ("delete") };	1288	on_activate => sub { $self->emit ("delete") };
1114		1289
1115	$self->CFClient::UI::Container::add ($self->{close_button});	1290	$self->CFPlus::UI::Container::add ($self->{close_button});
1116	}	1291	}
1117		1292
1118	$self	1293	$self
1119	}	1294	}
1120		1295
1121	sub add {	1296	sub add {
1122	my ($self, @widgets) = @_;	1297	my ($self, @widgets) = @_;
1123		1298
1124	$self->SUPER::add (@widgets);	1299	$self->SUPER::add (@widgets);
1125	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1300	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1126	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1301	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1127	}	1302	}
1128		1303
1129	sub border {	1304	sub border {
1130	int $_[0]{border} * $::FONTSIZE	1305	int $_[0]{border} * $::FONTSIZE
1131	}	1306	}
…		…
1239	$self->{motion}->($ev, $x, $y) if $self->{motion};	1414	$self->{motion}->($ev, $x, $y) if $self->{motion};
1240		1415
1241	! ! $self->{motion}	1416	! ! $self->{motion}
1242	}	1417	}
1243		1418
		1419	sub invoke_visibility_change {
		1420	my ($self, $visible) = @_;
		1421
		1422	delete $self->{motion} unless $visible;
		1423
		1424	0
		1425	}
		1426
1244	sub _draw {	1427	sub _draw {
1245	my ($self) = @_;	1428	my ($self) = @_;
1246		1429
1247	my $child = $self->{children}[0];	1430	my $child = $self->{children}[0];
1248		1431
…		…
1285	if $self->{close_button};	1468	if $self->{close_button};
1286	}	1469	}
1287		1470
1288	#############################################################################	1471	#############################################################################
1289		1472
1290	package CFClient::UI::Table;	1473	package CFPlus::UI::Table;
1291		1474
1292	our @ISA = CFClient::UI::Base::;	1475	our @ISA = CFPlus::UI::Base::;
1293		1476
1294	use List::Util qw(max sum);	1477	use List::Util qw(max sum);
1295		1478
1296	use CFClient::OpenGL;	1479	use CFPlus::OpenGL;
1297		1480
1298	sub new {	1481	sub new {
1299	my $class = shift;	1482	my $class = shift;
1300		1483
1301	$class->SUPER::new (	1484	$class->SUPER::new (
…		…
1307	sub children {	1490	sub children {
1308	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1491	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1309	}	1492	}
1310		1493
1311	sub add {	1494	sub add {
1312	my ($self, $x, $y, $child) = @_;	1495	my ($self) = shift;
1313		1496
		1497	while (@_) {
		1498	my ($x, $y, $child) = splice @_, 0, 3, ();
1314	$child->set_parent ($self);	1499	$child->set_parent ($self);
1315	$self->{children}[$y][$x] = $child;	1500	$self->{children}[$y][$x] = $child;
		1501	}
1316		1502
		1503	$self->{force_realloc} = 1;
		1504	$self->{force_size_alloc} = 1;
1317	$self->realloc;	1505	$self->realloc;
1318	}	1506	}
1319		1507
1320	sub remove {	1508	sub remove {
1321	my ($self, $child) = @_;	1509	my ($self, $child) = @_;
…		…
1386		1574
1387	# linearly scale sizes	1575	# linearly scale sizes
1388	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1576	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1389	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1577	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1390		1578
1391	CFClient::UI::harmonize $ws;	1579	CFPlus::UI::harmonize $ws;
1392	CFClient::UI::harmonize $hs;	1580	CFPlus::UI::harmonize $hs;
1393		1581
1394	my $y;	1582	my $y;
1395		1583
1396	for my $r (0 .. $#{$self->{children}}) {	1584	for my $r (0 .. $#{$self->{children}}) {
1397	my $row = $self->{children}[$r]	1585	my $row = $self->{children}[$r]
…		…
1440	}	1628	}
1441	}	1629	}
1442		1630
1443	#############################################################################	1631	#############################################################################
1444		1632
1445	package CFClient::UI::Box;	1633	package CFPlus::UI::Box;
1446		1634
1447	our @ISA = CFClient::UI::Container::;	1635	our @ISA = CFPlus::UI::Container::;
1448		1636
1449	sub size_request {	1637	sub size_request {
1450	my ($self) = @_;	1638	my ($self) = @_;
1451		1639
1452	$self->{vertical}	1640	$self->{vertical}
…		…
1485	$req[$_] += $space * $children[$_]{expand}	1673	$req[$_] += $space * $children[$_]{expand}
1486	for 0 .. $#children;	1674	for 0 .. $#children;
1487	}	1675	}
1488	}	1676	}
1489		1677
1490	CFClient::UI::harmonize \@req;	1678	CFPlus::UI::harmonize \@req;
1491		1679
1492	my $pos = 0;	1680	my $pos = 0;
1493	for (0 .. $#children) {	1681	for (0 .. $#children) {
1494	my $alloc = $req[$_];	1682	my $alloc = $req[$_];
1495	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1683	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1500	1	1688	1
1501	}	1689	}
1502		1690
1503	#############################################################################	1691	#############################################################################
1504		1692
1505	package CFClient::UI::HBox;	1693	package CFPlus::UI::HBox;
1506		1694
1507	our @ISA = CFClient::UI::Box::;	1695	our @ISA = CFPlus::UI::Box::;
1508		1696
1509	sub new {	1697	sub new {
1510	my $class = shift;	1698	my $class = shift;
1511		1699
1512	$class->SUPER::new (	1700	$class->SUPER::new (
…		…
1515	)	1703	)
1516	}	1704	}
1517		1705
1518	#############################################################################	1706	#############################################################################
1519		1707
1520	package CFClient::UI::VBox;	1708	package CFPlus::UI::VBox;
1521		1709
1522	our @ISA = CFClient::UI::Box::;	1710	our @ISA = CFPlus::UI::Box::;
1523		1711
1524	sub new {	1712	sub new {
1525	my $class = shift;	1713	my $class = shift;
1526		1714
1527	$class->SUPER::new (	1715	$class->SUPER::new (
…		…
1530	)	1718	)
1531	}	1719	}
1532		1720
1533	#############################################################################	1721	#############################################################################
1534		1722
1535	package CFClient::UI::Label;	1723	package CFPlus::UI::Label;
1536		1724
1537	our @ISA = CFClient::UI::DrawBG::;	1725	our @ISA = CFPlus::UI::DrawBG::;
1538		1726
1539	use CFClient::OpenGL;	1727	use CFPlus::OpenGL;
1540		1728
1541	sub new {	1729	sub new {
1542	my ($class, %arg) = @_;	1730	my ($class, %arg) = @_;
1543		1731
1544	my $self = $class->SUPER::new (	1732	my $self = $class->SUPER::new (
…		…
1547	#active_bg => none	1735	#active_bg => none
1548	#font => default_font	1736	#font => default_font
1549	#text => initial text	1737	#text => initial text
1550	#markup => initial narkup	1738	#markup => initial narkup
1551	#max_w => maximum pixel width	1739	#max_w => maximum pixel width
		1740	#style => 0, # render flags
1552	ellipsise => 3, # end	1741	ellipsise => 3, # end
1553	layout => (new CFClient::Layout),	1742	layout => (new CFPlus::Layout),
1554	fontsize => 1,	1743	fontsize => 1,
1555	align => -1,	1744	align => -1,
1556	valign => -1,	1745	valign => -1,
1557	padding_x => 2,	1746	padding_x => 2,
1558	padding_y => 2,	1747	padding_y => 2,
1559	can_events => 0,	1748	can_events => 0,
1560	%arg	1749	%arg
1561	);	1750	);
1562		1751
1563	if (exists $self->{template}) {	1752	if (exists $self->{template}) {
1564	my $layout = new CFClient::Layout;	1753	my $layout = new CFPlus::Layout;
1565	$layout->set_text (delete $self->{template});	1754	$layout->set_text (delete $self->{template});
1566	$self->{template} = $layout;	1755	$self->{template} = $layout;
1567	}	1756	}
1568		1757
1569	if (exists $self->{markup}) {	1758	if (exists $self->{markup}) {
…		…
1571	} else {	1760	} else {
1572	$self->set_text (delete $self->{text});	1761	$self->set_text (delete $self->{text});
1573	}	1762	}
1574		1763
1575	$self	1764	$self
1576	}
1577
1578	sub escape($) {
1579	local $_ = $_[0];
1580
1581	s/&/&amp;/g;
1582	s/>/&gt;/g;
1583	s/</&lt;/g;
1584
1585	$_
1586	}	1765	}
1587		1766
1588	sub update {	1767	sub update {
1589	my ($self) = @_;	1768	my ($self) = @_;
1590		1769
…		…
1717	};	1896	};
1718		1897
1719	my $w = List::Util::min $self->{w} + 4, $size->[0];	1898	my $w = List::Util::min $self->{w} + 4, $size->[0];
1720	my $h = List::Util::min $self->{h} + 2, $size->[1];	1899	my $h = List::Util::min $self->{h} + 2, $size->[1];
1721		1900
1722	$self->{layout}->render ($self->{ox}, $self->{oy});	1901	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1723	}	1902	}
1724		1903
1725	#############################################################################	1904	#############################################################################
1726		1905
1727	package CFClient::UI::EntryBase;	1906	package CFPlus::UI::EntryBase;
1728		1907
1729	our @ISA = CFClient::UI::Label::;	1908	our @ISA = CFPlus::UI::Label::;
1730		1909
1731	use CFClient::OpenGL;	1910	use CFPlus::OpenGL;
1732		1911
1733	sub new {	1912	sub new {
1734	my $class = shift;	1913	my $class = shift;
1735		1914
1736	$class->SUPER::new (	1915	$class->SUPER::new (
…		…
1740	active_fg => [0, 0, 0],	1919	active_fg => [0, 0, 0],
1741	can_hover => 1,	1920	can_hover => 1,
1742	can_focus => 1,	1921	can_focus => 1,
1743	valign => 0,	1922	valign => 0,
1744	can_events => 1,	1923	can_events => 1,
		1924	ellipsise => 0,
1745	#text => ...	1925	#text => ...
1746	#hidden => "*",	1926	#hidden => "*",
1747	@_	1927	@_
1748	)	1928	)
1749	}	1929	}
…		…
1794	my $sym = $ev->{sym};	1974	my $sym = $ev->{sym};
1795	my $uni = $ev->{unicode};	1975	my $uni = $ev->{unicode};
1796		1976
1797	my $text = $self->get_text;	1977	my $text = $self->get_text;
1798		1978
		1979	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		1980
1799	if ($uni == 8) {	1981	if ($uni == 8) {
1800	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1982	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1801	} elsif ($uni == 127) {	1983	} elsif ($uni == 127) {
1802	substr $text, $self->{cursor}, 1, "";	1984	substr $text, $self->{cursor}, 1, "";
1803	} elsif ($sym == CFClient::SDLK_LEFT) {	1985	} elsif ($sym == CFPlus::SDLK_LEFT) {
1804	--$self->{cursor} if $self->{cursor};	1986	--$self->{cursor} if $self->{cursor};
1805	} elsif ($sym == CFClient::SDLK_RIGHT) {	1987	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1806	++$self->{cursor} if $self->{cursor} < length $self->{text};	1988	++$self->{cursor} if $self->{cursor} < length $self->{text};
1807	} elsif ($sym == CFClient::SDLK_HOME) {	1989	} elsif ($sym == CFPlus::SDLK_HOME) {
		1990	# what a hack
		1991	$self->{cursor} =
		1992	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		1993	? length $1
		1994	: 0;
		1995	} elsif ($sym == CFPlus::SDLK_END) {
		1996	# uh, again
		1997	$self->{cursor} =
		1998	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		1999	? $self->{cursor} + length $1
		2000	: length $self->{text};
		2001	} elsif ($uni == 21) { # ctrl-u
		2002	$text = "";
1808	$self->{cursor} = 0;	2003	$self->{cursor} = 0;
1809	} elsif ($sym == CFClient::SDLK_END) {
1810	$self->{cursor} = length $text;
1811	} elsif ($uni == 27) {	2004	} elsif ($uni == 27) {
1812	$self->emit ('escape');	2005	$self->emit ('escape');
1813	} elsif ($uni) {	2006	} elsif ($uni == 0x0d) {
		2007	substr $text, $self->{cursor}++, 0, "\012";
		2008	} elsif ($uni >= 0x20) {
1814	substr $text, $self->{cursor}++, 0, chr $uni;	2009	substr $text, $self->{cursor}++, 0, chr $uni;
1815	} else {	2010	} else {
1816	return 0;	2011	return 0;
1817	}	2012	}
1818		2013
1819	$self->_set_text ($text);	2014	$self->_set_text ($text);
1820		2015
1821	$self->realloc;	2016	$self->realloc;
		2017	$self->update;
1822		2018
1823	1	2019	1
1824	}	2020	}
1825		2021
1826	sub invoke_focus_in {	2022	sub invoke_focus_in {
…		…
1888	utf8::encode $text;	2084	utf8::encode $text;
1889		2085
1890	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2086	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1891	}	2087	}
1892		2088
1893	glColor @{$self->{fg}};
1894	glBegin GL_LINES;	2089	glBegin GL_LINES;
1895	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2090	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1896	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2091	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1897	glEnd;	2092	glEnd;
1898	}	2093	}
1899	}	2094	}
1900		2095
		2096	#############################################################################
		2097
1901	package CFClient::UI::Entry;	2098	package CFPlus::UI::Entry;
1902		2099
1903	our @ISA = CFClient::UI::EntryBase::;	2100	our @ISA = CFPlus::UI::EntryBase::;
1904		2101
1905	use CFClient::OpenGL;	2102	use CFPlus::OpenGL;
1906		2103
1907	sub invoke_key_down {	2104	sub invoke_key_down {
1908	my ($self, $ev) = @_;	2105	my ($self, $ev) = @_;
1909		2106
1910	my $sym = $ev->{sym};	2107	my $sym = $ev->{sym};
1911		2108
1912	if ($sym == 13) {	2109	if ($ev->{uni} == 0x0d || $sym == 13) {
1913	unshift @{$self->{history}},	2110	unshift @{$self->{history}},
1914	my $txt = $self->get_text;	2111	my $txt = $self->get_text;
1915		2112
1916	$self->{history_pointer} = -1;	2113	$self->{history_pointer} = -1;
1917	$self->{history_saveback} = '';	2114	$self->{history_saveback} = '';
1918	$self->emit (activate => $txt);	2115	$self->emit (activate => $txt);
1919	$self->update;	2116	$self->update;
1920		2117
1921	} elsif ($sym == CFClient::SDLK_UP) {	2118	} elsif ($sym == CFPlus::SDLK_UP) {
1922	if ($self->{history_pointer} < 0) {	2119	if ($self->{history_pointer} < 0) {
1923	$self->{history_saveback} = $self->get_text;	2120	$self->{history_saveback} = $self->get_text;
1924	}	2121	}
1925	if (@{$self->{history} || []} > 0) {	2122	if (@{$self->{history} || []} > 0) {
1926	$self->{history_pointer}++;	2123	$self->{history_pointer}++;
…		…
1928	$self->{history_pointer} = @{$self->{history} || []} - 1;	2125	$self->{history_pointer} = @{$self->{history} || []} - 1;
1929	}	2126	}
1930	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2127	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1931	}	2128	}
1932		2129
1933	} elsif ($sym == CFClient::SDLK_DOWN) {	2130	} elsif ($sym == CFPlus::SDLK_DOWN) {
1934	$self->{history_pointer}--;	2131	$self->{history_pointer}--;
1935	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2132	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1936		2133
1937	if ($self->{history_pointer} >= 0) {	2134	if ($self->{history_pointer} >= 0) {
1938	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2135	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1947	1	2144	1
1948	}	2145	}
1949		2146
1950	#############################################################################	2147	#############################################################################
1951		2148
		2149	package CFPlus::UI::TextEdit;
		2150
		2151	our @ISA = CFPlus::UI::EntryBase::;
		2152
		2153	use CFPlus::OpenGL;
		2154
		2155	sub move_cursor_ver {
		2156	my ($self, $dy) = @_;
		2157
		2158	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2159
		2160	$y += $dy;
		2161
		2162	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2163	$self->{cursor} = $index;
		2164	delete $self->{cur_h};
		2165	$self->update;
		2166	return;
		2167	}
		2168	}
		2169
		2170	sub invoke_key_down {
		2171	my ($self, $ev) = @_;
		2172
		2173	my $sym = $ev->{sym};
		2174
		2175	if ($sym == CFPlus::SDLK_UP) {
		2176	$self->move_cursor_ver (-1);
		2177	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2178	$self->move_cursor_ver (+1);
		2179	} else {
		2180	return $self->SUPER::invoke_key_down ($ev)
		2181	}
		2182
		2183	1
		2184	}
		2185
		2186	#############################################################################
		2187
1952	package CFClient::UI::Button;	2188	package CFPlus::UI::Button;
1953		2189
1954	our @ISA = CFClient::UI::Label::;	2190	our @ISA = CFPlus::UI::Label::;
1955		2191
1956	use CFClient::OpenGL;	2192	use CFPlus::OpenGL;
1957		2193
1958	my @tex =	2194	my @tex =
1959	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2195	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1960	qw(b1_button_active.png);	2196	qw(b1_button_active.png);
1961		2197
1962	sub new {	2198	sub new {
1963	my $class = shift;	2199	my $class = shift;
1964		2200
…		…
2001	$self->SUPER::_draw;	2237	$self->SUPER::_draw;
2002	}	2238	}
2003		2239
2004	#############################################################################	2240	#############################################################################
2005		2241
		2242	package CFPlus::UI::CheckBox;
		2243
		2244	our @ISA = CFPlus::UI::DrawBG::;
		2245
		2246	my @tex =
		2247	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2248	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2249
		2250	use CFPlus::OpenGL;
		2251
		2252	sub new {
		2253	my $class = shift;
		2254
		2255	$class->SUPER::new (
		2256	padding_x => 2,
		2257	padding_y => 2,
		2258	fg => [1, 1, 1],
		2259	active_fg => [1, 1, 0],
		2260	bg => [0, 0, 0, 0.2],
		2261	active_bg => [1, 1, 1, 0.5],
		2262	state => 0,
		2263	can_hover => 1,
		2264	@_
		2265	)
		2266	}
		2267
		2268	sub size_request {
		2269	my ($self) = @_;
		2270
		2271	(6) x 2
		2272	}
		2273
		2274	sub toggle {
		2275	my ($self) = @_;
		2276
		2277	$self->{state} = !$self->{state};
		2278	$self->emit (changed => $self->{state});
		2279	$self->update;
		2280	}
		2281
		2282	sub invoke_button_down {
		2283	my ($self, $ev, $x, $y) = @_;
		2284
		2285	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2286	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2287	$self->toggle;
		2288	} else {
		2289	return 0
		2290	}
		2291
		2292	1
		2293	}
		2294
		2295	sub _draw {
		2296	my ($self) = @_;
		2297
		2298	$self->SUPER::_draw;
		2299
		2300	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2301
		2302	my ($w, $h) = @$self{qw(w h)};
		2303
		2304	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2305
		2306	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2307
		2308	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2309
		2310	glEnable GL_TEXTURE_2D;
		2311	$tex->draw_quad_alpha (0, 0, $s, $s);
		2312	glDisable GL_TEXTURE_2D;
		2313	}
		2314
		2315	#############################################################################
		2316
		2317	package CFPlus::UI::Image;
		2318
		2319	our @ISA = CFPlus::UI::Base::;
		2320
		2321	use CFPlus::OpenGL;
		2322
		2323	our %texture_cache;
		2324
		2325	sub new {
		2326	my $class = shift;
		2327
		2328	my $self = $class->SUPER::new (
		2329	can_events => 0,
		2330	@_,
		2331	);
		2332
		2333	$self->{path} || $self->{tex}
		2334	or Carp::croak "'path' or 'tex' attributes required";
		2335
		2336	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2337	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2338
		2339	CFPlus::weaken $texture_cache{$self->{path}};
		2340
		2341	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2342
		2343	$self
		2344	}
		2345
		2346	sub STORABLE_freeze {
		2347	my ($self, $cloning) = @_;
		2348
		2349	$self->{path}
		2350	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2351
		2352	$self->{path}
		2353	}
		2354
		2355	sub STORABLE_attach {
		2356	my ($self, $cloning, $path) = @_;
		2357
		2358	$self->new (path => $path)
		2359	}
		2360
		2361	sub size_request {
		2362	my ($self) = @_;
		2363
		2364	($self->{tex}{w}, $self->{tex}{h})
		2365	}
		2366
		2367	sub _draw {
		2368	my ($self) = @_;
		2369
		2370	my $tex = $self->{tex};
		2371
		2372	my ($w, $h) = ($self->{w}, $self->{h});
		2373
		2374	if ($self->{rot90}) {
		2375	glRotate 90, 0, 0, 1;
		2376	glTranslate 0, -$self->{w}, 0;
		2377
		2378	($w, $h) = ($h, $w);
		2379	}
		2380
		2381	glEnable GL_TEXTURE_2D;
		2382	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2383
		2384	$tex->draw_quad (0, 0, $w, $h);
		2385
		2386	glDisable GL_TEXTURE_2D;
		2387	}
		2388
		2389	#############################################################################
		2390
2006	package CFClient::UI::ImageButton;	2391	package CFPlus::UI::ImageButton;
2007		2392
2008	our @ISA = CFClient::UI::Image::;	2393	our @ISA = CFPlus::UI::Image::;
2009		2394
2010	use CFClient::OpenGL;	2395	use CFPlus::OpenGL;
2011		2396
2012	my %textures;	2397	my %textures;
2013		2398
2014	sub new {	2399	sub new {
2015	my $class = shift;	2400	my $class = shift;
…		…
2037	1	2422	1
2038	}	2423	}
2039		2424
2040	#############################################################################	2425	#############################################################################
2041		2426
2042	package CFClient::UI::CheckBox;
2043
2044	our @ISA = CFClient::UI::DrawBG::;
2045
2046	my @tex =
2047	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2048	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2049
2050	use CFClient::OpenGL;
2051
2052	sub new {
2053	my $class = shift;
2054
2055	$class->SUPER::new (
2056	padding_x => 2,
2057	padding_y => 2,
2058	fg => [1, 1, 1],
2059	active_fg => [1, 1, 0],
2060	bg => [0, 0, 0, 0.2],
2061	active_bg => [1, 1, 1, 0.5],
2062	state => 0,
2063	can_hover => 1,
2064	@_
2065	)
2066	}
2067
2068	sub size_request {
2069	my ($self) = @_;
2070
2071	(6) x 2
2072	}
2073
2074	sub toggle {
2075	my ($self) = @_;
2076
2077	$self->{state} = !$self->{state};
2078	$self->emit (changed => $self->{state});
2079	$self->update;
2080	}
2081
2082	sub invoke_button_down {
2083	my ($self, $ev, $x, $y) = @_;
2084
2085	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2086	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2087	$self->toggle;
2088	} else {
2089	return 0
2090	}
2091
2092	1
2093	}
2094
2095	sub _draw {
2096	my ($self) = @_;
2097
2098	$self->SUPER::_draw;
2099
2100	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2101
2102	my ($w, $h) = @$self{qw(w h)};
2103
2104	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2105
2106	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2107
2108	my $tex = $self->{state} ? $tex[1] : $tex[0];
2109
2110	glEnable GL_TEXTURE_2D;
2111	$tex->draw_quad_alpha (0, 0, $s, $s);
2112	glDisable GL_TEXTURE_2D;
2113	}
2114
2115	#############################################################################
2116
2117	package CFClient::UI::Image;	2427	package CFPlus::UI::VGauge;
2118		2428
2119	our @ISA = CFClient::UI::Base::;	2429	our @ISA = CFPlus::UI::Base::;
2120
2121	use CFClient::OpenGL;
2122
2123	our %texture_cache;
2124
2125	sub new {
2126	my $class = shift;
2127
2128	my $self = $class->SUPER::new (
2129	can_events => 0,
2130	@_,
2131	);
2132
2133	$self->{path} || $self->{tex}
2134	or Carp::croak "'path' or 'tex' attributes required";
2135
2136	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2137	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2138
2139	Scalar::Util::weaken $texture_cache{$self->{path}};
2140
2141	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2142
2143	$self
2144	}
2145
2146	sub size_request {
2147	my ($self) = @_;
2148
2149	($self->{tex}{w}, $self->{tex}{h})
2150	}
2151
2152	sub _draw {
2153	my ($self) = @_;
2154
2155	my $tex = $self->{tex};
2156
2157	my ($w, $h) = ($self->{w}, $self->{h});
2158
2159	if ($self->{rot90}) {
2160	glRotate 90, 0, 0, 1;
2161	glTranslate 0, -$self->{w}, 0;
2162
2163	($w, $h) = ($h, $w);
2164	}
2165
2166	glEnable GL_TEXTURE_2D;
2167	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2168
2169	$tex->draw_quad_alpha (0, 0, $w, $h);
2170
2171	glDisable GL_TEXTURE_2D;
2172	}
2173
2174	#############################################################################
2175
2176	package CFClient::UI::VGauge;
2177
2178	our @ISA = CFClient::UI::Base::;
2179		2430
2180	use List::Util qw(min max);	2431	use List::Util qw(min max);
2181		2432
2182	use CFClient::OpenGL;	2433	use CFPlus::OpenGL;
2183		2434
2184	my %tex = (	2435	my %tex = (
2185	food => [	2436	food => [
2186	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2437	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2438	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2188	],	2439	],
2189	grace => [	2440	grace => [
2190	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2441	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2191	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2442	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2192	],	2443	],
2193	hp => [	2444	hp => [
2194	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2445	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2195	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2446	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2196	],	2447	],
2197	mana => [	2448	mana => [
2198	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2449	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2199	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2450	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2200	],	2451	],
2201	);	2452	);
2202		2453
2203	# eg. VGauge->new (gauge => 'food'), default gauge: food	2454	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2306	glDisable GL_TEXTURE_2D;	2557	glDisable GL_TEXTURE_2D;
2307	}	2558	}
2308		2559
2309	#############################################################################	2560	#############################################################################
2310		2561
2311	package CFClient::UI::Gauge;	2562	package CFPlus::UI::Gauge;
2312		2563
2313	our @ISA = CFClient::UI::VBox::;	2564	our @ISA = CFPlus::UI::VBox::;
2314		2565
2315	sub new {	2566	sub new {
2316	my ($class, %arg) = @_;	2567	my ($class, %arg) = @_;
2317		2568
2318	my $self = $class->SUPER::new (	2569	my $self = $class->SUPER::new (
…		…
2320	can_hover => 1,	2571	can_hover => 1,
2321	can_events => 1,	2572	can_events => 1,
2322	%arg,	2573	%arg,
2323	);	2574	);
2324		2575
2325	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2576	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2326	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2577	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2327	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2578	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2328		2579
2329	$self	2580	$self
2330	}	2581	}
2331		2582
2332	sub set_fontsize {	2583	sub set_fontsize {
…		…
2353	$self->{value}->set_text ($val);	2604	$self->{value}->set_text ($val);
2354	}	2605	}
2355		2606
2356	#############################################################################	2607	#############################################################################
2357		2608
2358	package CFClient::UI::Slider;	2609	package CFPlus::UI::Slider;
2359		2610
2360	use strict;	2611	use strict;
2361		2612
2362	use CFClient::OpenGL;	2613	use CFPlus::OpenGL;
2363		2614
2364	our @ISA = CFClient::UI::DrawBG::;	2615	our @ISA = CFPlus::UI::DrawBG::;
2365		2616
2366	my @tex =	2617	my @tex =
2367	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2618	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2368	qw(s1_slider.png s1_slider_bg.png);	2619	qw(s1_slider.png s1_slider_bg.png);
2369		2620
2370	sub new {	2621	sub new {
2371	my $class = shift;	2622	my $class = shift;
2372		2623
…		…
2461	}	2712	}
2462		2713
2463	1	2714	1
2464	}	2715	}
2465		2716
		2717	sub invoke_mouse_wheel {
		2718	my ($self, $ev) = @_;
		2719
		2720	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2721
		2722	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2723
		2724	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2725
		2726	! ! $delta
		2727	}
		2728
2466	sub update {	2729	sub update {
2467	my ($self) = @_;	2730	my ($self) = @_;
2468		2731
2469	delete $self->{knob_w};	2732	delete $self->{knob_w};
2470	$self->SUPER::update;	2733	$self->SUPER::update;
…		…
2517	glDisable GL_TEXTURE_2D;	2780	glDisable GL_TEXTURE_2D;
2518	}	2781	}
2519		2782
2520	#############################################################################	2783	#############################################################################
2521		2784
2522	package CFClient::UI::ValSlider;	2785	package CFPlus::UI::ValSlider;
2523		2786
2524	our @ISA = CFClient::UI::HBox::;	2787	our @ISA = CFPlus::UI::HBox::;
2525		2788
2526	sub new {	2789	sub new {
2527	my ($class, %arg) = @_;	2790	my ($class, %arg) = @_;
2528		2791
2529	my $range = delete $arg{range};	2792	my $range = delete $arg{range};
2530		2793
2531	my $self = $class->SUPER::new (	2794	my $self = $class->SUPER::new (
2532	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2795	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2533	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2796	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2534	to_value => sub { shift },	2797	to_value => sub { shift },
2535	from_value => sub { shift },	2798	from_value => sub { shift },
2536	%arg,	2799	%arg,
2537	);	2800	);
2538		2801
…		…
2558	sub set_range { shift->{slider}->set_range (@_) }	2821	sub set_range { shift->{slider}->set_range (@_) }
2559	sub set_value { shift->{slider}->set_value (@_) }	2822	sub set_value { shift->{slider}->set_value (@_) }
2560		2823
2561	#############################################################################	2824	#############################################################################
2562		2825
2563	package CFClient::UI::TextScroller;	2826	package CFPlus::UI::TextScroller;
2564		2827
2565	our @ISA = CFClient::UI::HBox::;	2828	our @ISA = CFPlus::UI::HBox::;
2566		2829
2567	use CFClient::OpenGL;	2830	use CFPlus::OpenGL;
2568		2831
2569	sub new {	2832	sub new {
2570	my $class = shift;	2833	my $class = shift;
2571		2834
2572	my $self = $class->SUPER::new (	2835	my $self = $class->SUPER::new (
2573	fontsize => 1,	2836	fontsize => 1,
2574	can_events => 0,	2837	can_events => 1,
2575	indent => 0,	2838	indent => 0,
2576	#font => default_font	2839	#font => default_font
2577	@_,	2840	@_,
2578		2841
2579	layout => (new CFClient::Layout),	2842	layout => (new CFPlus::Layout),
2580	par => [],	2843	par => [],
		2844	max_par => 0,
2581	height => 0,	2845	height => 0,
2582	children => [	2846	children => [
2583	(new CFClient::UI::Empty expand => 1),	2847	(new CFPlus::UI::Empty expand => 1),
2584	(new CFClient::UI::Slider vertical => 1),	2848	(new CFPlus::UI::Slider vertical => 1),
2585	],	2849	],
2586	);	2850	);
2587		2851
2588	$self->{children}[1]->connect (changed => sub { $self->update });	2852	$self->{children}[1]->connect (changed => sub { $self->update });
2589		2853
…		…
2619		2883
2620	$self->reflow;	2884	$self->reflow;
2621		2885
2622	local $self->{children} = [$empty, $slider];	2886	local $self->{children} = [$empty, $slider];
2623	$self->SUPER::invoke_size_allocate ($w, $h)	2887	$self->SUPER::invoke_size_allocate ($w, $h)
		2888	}
		2889
		2890	sub invoke_mouse_wheel {
		2891	my ($self, $ev) = @_;
		2892
		2893	return 0 unless $ev->{dy}; # only vertical movements
		2894
		2895	$self->{children}[1]->emit (mouse_wheel => $ev);
		2896
		2897	1
2624	}	2898	}
2625		2899
2626	sub get_layout {	2900	sub get_layout {
2627	my ($self, $para) = @_;	2901	my ($self, $para) = @_;
2628		2902
…		…
2656		2930
2657	# todo: base offset on lines or so, not on pixels	2931	# todo: base offset on lines or so, not on pixels
2658	$self->{children}[1]->set_value ($offset);	2932	$self->{children}[1]->set_value ($offset);
2659	}	2933	}
2660		2934
		2935	sub current_paragraph {
		2936	my ($self) = @_;
		2937
		2938	$self->{top_paragraph} - 1
		2939	}
		2940
		2941	sub scroll_to {
		2942	my ($self, $para) = @_;
		2943
		2944	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2945
		2946	$self->{scroll_to} = $para;
		2947	$self->update;
		2948	}
		2949
2661	sub clear {	2950	sub clear {
2662	my ($self) = @_;	2951	my ($self) = @_;
2663		2952
2664	my (undef, undef, @other) = @{ $self->{children} };	2953	my (undef, undef, @other) = @{ $self->{children} };
2665	$self->remove ($_) for @other;	2954	$self->remove ($_) for @other;
…		…
2668	$self->{height} = 0;	2957	$self->{height} = 0;
2669	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2958	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2670	}	2959	}
2671		2960
2672	sub add_paragraph {	2961	sub add_paragraph {
2673	my ($self, $color, $para, $indent) = @_;	2962	my $self = shift;
2674		2963
2675	my ($text, @w) = ref $para ? @$para : $para;	2964	for my $para (@_) {
2676
2677	$para = {	2965	$para = {
		2966	fg => [1, 1, 1, 1],
		2967	indent => 0,
		2968	markup => "",
		2969	widget => [],
		2970	ref $para ? %$para : (markup => $para),
2678	w => 1e10,	2971	w => 1e10,
2679	wrapped => 1,	2972	wrapped => 1,
2680	fg => $color,
2681	indent => $indent,
2682	markup => $text,
2683	widget => \@w,
2684	};	2973	};
2685		2974
2686	$self->add (@w) if @w;	2975	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2687	push @{$self->{par}}, $para;	2976	push @{$self->{par}}, $para;
		2977	}
		2978
		2979	if (my $max = $self->{max_par}) {
		2980	shift @{$self->{par}} while @{$self->{par}} > $max;
		2981	}
2688		2982
2689	$self->{need_reflow}++;	2983	$self->{need_reflow}++;
2690	$self->update;	2984	$self->update;
2691	}	2985	}
2692		2986
2693	sub scroll_to_bottom {	2987	sub scroll_to_bottom {
2694	my ($self) = @_;	2988	my ($self) = @_;
2695		2989
2696	$self->{scroll_to_bottom} = 1;	2990	$self->{scroll_to} = $#{$self->{par}};
2697	$self->update;	2991	$self->update;
2698	}	2992	}
2699		2993
		2994	sub force_uptodate {
		2995	my ($self) = @_;
		2996
		2997	if (delete $self->{need_reflow}) {
		2998	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2999
		3000	my $height = 0;
		3001
		3002	for my $para (@{$self->{par}}) {
		3003	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3004	my $layout = $self->get_layout ($para);
		3005	my ($w, $h) = $layout->size;
		3006
		3007	$para->{w} = $w + $para->{indent};
		3008	$para->{h} = $h;
		3009	$para->{wrapped} = $layout->has_wrapped;
		3010	}
		3011
		3012	$para->{y} = $height;
		3013	$height += $para->{h};
		3014	}
		3015
		3016	$self->{height} = $height;
		3017	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3018
		3019	delete $self->{texture};
		3020	}
		3021
		3022	if (my $paridx = delete $self->{scroll_to}) {
		3023	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3024	}
		3025	}
		3026
2700	sub update {	3027	sub update {
2701	my ($self) = @_;	3028	my ($self) = @_;
2702		3029
2703	$self->SUPER::update;	3030	$self->SUPER::update;
2704		3031
2705	return unless $self->{h} > 0;	3032	return unless $self->{h} > 0;
2706		3033
2707	delete $self->{texture};	3034	delete $self->{texture};
2708		3035
2709	$ROOT->on_post_alloc ($self => sub {	3036	$ROOT->on_post_alloc ($self => sub {
		3037	$self->force_uptodate;
		3038
2710	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3039	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2711		3040
2712	if (delete $self->{need_reflow}) {
2713	my $height = 0;
2714
2715	for my $para (@{$self->{par}}) {
2716	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2717	my $layout = $self->get_layout ($para);
2718	my ($w, $h) = $layout->size;
2719
2720	$para->{w} = $w + $para->{indent};
2721	$para->{h} = $h;
2722	$para->{wrapped} = $layout->has_wrapped;
2723	}
2724
2725	$height += $para->{h};
2726	}
2727
2728	$self->{height} = $height;
2729
2730	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2731
2732	delete $self->{texture};
2733	}
2734
2735	if (delete $self->{scroll_to_bottom}) {
2736	$self->{children}[1]->set_value (1e10);
2737	}
2738
2739	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3041	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2740	glClearColor 0, 0, 0, 0;	3042	glClearColor 0, 0, 0, 0;
2741	glClear GL_COLOR_BUFFER_BIT;	3043	glClear GL_COLOR_BUFFER_BIT;
2742		3044
		3045	package CFPlus::UI::Base;
		3046	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3047	(0, 0, $self->{w}, $self->{h});
		3048
		3049	my $top = int $self->{children}[1]{range}[0];
		3050
		3051	my $paridx = 0;
		3052	my $top_paragraph;
2743	my $top = int $self->{children}[1]{range}[0];	3053	my $top = int $self->{children}[1]{range}[0];
2744		3054
2745	my $y0 = $top;	3055	my $y0 = $top;
2746	my $y1 = $top + $H;	3056	my $y1 = $top + $H;
2747		3057
2748	my $y = 0;
2749
2750	for my $para (@{$self->{par}}) {	3058	for my $para (@{$self->{par}}) {
2751	my $h = $para->{h};	3059	my $h = $para->{h};
		3060	my $y = $para->{y};
2752		3061
2753	if ($y0 < $y + $h && $y < $y1) {	3062	if ($y0 < $y + $h && $y < $y1) {
2754
2755	my $layout = $self->get_layout ($para);	3063	my $layout = $self->get_layout ($para);
2756		3064
2757	$layout->render ($para->{indent}, $y - $y0);	3065	$layout->render ($para->{indent}, $y - $y0);
2758		3066
2759	if (my @w = @{ $para->{widget} }) {	3067	if (my @w = @{ $para->{widget} }) {
…		…
2768	$_->draw;	3076	$_->draw;
2769	}	3077	}
2770	}	3078	}
2771	}	3079	}
2772		3080
2773	$y += $h;	3081	$paridx++;
		3082	$top_paragraph ||= $paridx if $y >= $top;
2774	}	3083	}
		3084
		3085	$self->{top_paragraph} = $top_paragraph;
2775	};	3086	};
2776	});	3087	});
2777	}	3088	}
2778		3089
2779	sub reconfigure {	3090	sub reconfigure {
…		…
2797	$self->{children}[1]->draw;	3108	$self->{children}[1]->draw;
2798	}	3109	}
2799		3110
2800	#############################################################################	3111	#############################################################################
2801		3112
2802	package CFClient::UI::Animator;	3113	package CFPlus::UI::Animator;
2803		3114
2804	use CFClient::OpenGL;	3115	use CFPlus::OpenGL;
2805		3116
2806	our @ISA = CFClient::UI::Bin::;	3117	our @ISA = CFPlus::UI::Bin::;
2807		3118
2808	sub moveto {	3119	sub moveto {
2809	my ($self, $x, $y) = @_;	3120	my ($self, $x, $y) = @_;
2810		3121
2811	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3122	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2839	glPopMatrix;	3150	glPopMatrix;
2840	}	3151	}
2841		3152
2842	#############################################################################	3153	#############################################################################
2843		3154
2844	package CFClient::UI::Flopper;	3155	package CFPlus::UI::Flopper;
2845		3156
2846	our @ISA = CFClient::UI::Button::;	3157	our @ISA = CFPlus::UI::Button::;
2847		3158
2848	sub new {	3159	sub new {
2849	my $class = shift;	3160	my $class = shift;
2850		3161
2851	my $self = $class->SUPER::new (	3162	my $self = $class->SUPER::new (
…		…
2863	$self->{other}->toggle_visibility;	3174	$self->{other}->toggle_visibility;
2864	}	3175	}
2865		3176
2866	#############################################################################	3177	#############################################################################
2867		3178
2868	package CFClient::UI::Tooltip;	3179	package CFPlus::UI::Tooltip;
2869		3180
2870	our @ISA = CFClient::UI::Bin::;	3181	our @ISA = CFPlus::UI::Bin::;
2871		3182
2872	use CFClient::OpenGL;	3183	use CFPlus::OpenGL;
2873		3184
2874	sub new {	3185	sub new {
2875	my $class = shift;	3186	my $class = shift;
2876		3187
2877	$class->SUPER::new (	3188	$class->SUPER::new (
…		…
2880	)	3191	)
2881	}	3192	}
2882		3193
2883	sub set_tooltip_from {	3194	sub set_tooltip_from {
2884	my ($self, $widget) = @_;	3195	my ($self, $widget) = @_;
		3196
		3197	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3198	if $widget->{tooltip} =~ /^#(.*)$/;
2885		3199
2886	my $tooltip = $widget->{tooltip};	3200	my $tooltip = $widget->{tooltip};
2887		3201
2888	if ($ENV{CFPLUS_DEBUG} & 2) {	3202	if ($ENV{CFPLUS_DEBUG} & 2) {
2889	$tooltip .= "\n\n" . (ref $widget) . "\n"	3203	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2893	}	3207	}
2894		3208
2895	$tooltip =~ s/^\n+//;	3209	$tooltip =~ s/^\n+//;
2896	$tooltip =~ s/\n+$//;	3210	$tooltip =~ s/\n+$//;
2897		3211
2898	$self->add (new CFClient::UI::Label	3212	$self->add (new CFPlus::UI::Label
2899	markup => $tooltip,	3213	markup => $tooltip,
2900	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3214	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2901	fontsize => 0.8,	3215	fontsize => 0.8,
2902	fg => [0, 0, 0, 1],	3216	style => 1, # FLAG_INVERSE
2903	ellipsise => 0,	3217	ellipsise => 0,
2904	font => ($widget->{tooltip_font} || $::FONT_PROP),	3218	font => ($widget->{tooltip_font} || $::FONT_PROP),
2905	);	3219	);
2906	}	3220	}
2907		3221
…		…
2926		3240
2927	$self->{root}->on_post_alloc ("move_$self" => sub {	3241	$self->{root}->on_post_alloc ("move_$self" => sub {
2928	my $widget = $self->{owner}	3242	my $widget = $self->{owner}
2929	or return;	3243	or return;
2930		3244
		3245	if ($widget->{visible}) {
2931	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3246	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2932		3247
2933	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3248	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2934	if $x + $self->{w} > $self->{root}{w};	3249	if $x + $self->{w} > $self->{root}{w};
2935		3250
2936	$self->move_abs ($x, $y);	3251	$self->move_abs ($x, $y);
		3252	} else {
		3253	$self->hide;
		3254	}
2937	});	3255	});
2938	}	3256	}
2939		3257
2940	sub _draw {	3258	sub _draw {
2941	my ($self) = @_;	3259	my ($self) = @_;
…		…
2965	$self->SUPER::_draw;	3283	$self->SUPER::_draw;
2966	}	3284	}
2967		3285
2968	#############################################################################	3286	#############################################################################
2969		3287
2970	package CFClient::UI::Face;	3288	package CFPlus::UI::Face;
2971		3289
2972	our @ISA = CFClient::UI::Base::;	3290	our @ISA = CFPlus::UI::DrawBG::;
2973		3291
2974	use CFClient::OpenGL;	3292	use CFPlus::OpenGL;
2975		3293
2976	sub new {	3294	sub new {
2977	my $class = shift;	3295	my $class = shift;
2978		3296
2979	my $self = $class->SUPER::new (	3297	my $self = $class->SUPER::new (
…		…
2981	can_events => 0,	3299	can_events => 0,
2982	@_,	3300	@_,
2983	);	3301	);
2984		3302
2985	if ($self->{anim} && $self->{animspeed}) {	3303	if ($self->{anim} && $self->{animspeed}) {
2986	Scalar::Util::weaken (my $widget = $self);	3304	CFPlus::weaken (my $widget = $self);
2987		3305
2988	$self->{timer} = Event->timer (	3306	$self->{timer} = Event->timer (
2989	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3307	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2990	hard => 1,	3308	hard => 1,
2991	interval => $self->{animspeed},	3309	interval => $self->{animspeed},
…		…
3014	sub _draw {	3332	sub _draw {
3015	my ($self) = @_;	3333	my ($self) = @_;
3016		3334
3017	return unless $::CONN;	3335	return unless $::CONN;
3018		3336
		3337	$self->SUPER::_draw;
		3338
3019	my $face;	3339	my $face;
3020		3340
3021	if ($self->{frame}) {	3341	if ($self->{frame}) {
3022	my $anim = $::CONN->{anim}[$self->{anim}];	3342	my $anim = $::CONN->{anim}[$self->{anim}];
3023		3343
…		…
3045	$self->SUPER::destroy;	3365	$self->SUPER::destroy;
3046	}	3366	}
3047		3367
3048	#############################################################################	3368	#############################################################################
3049		3369
3050	package CFClient::UI::Buttonbar;	3370	package CFPlus::UI::Buttonbar;
3051		3371
3052	our @ISA = CFClient::UI::HBox::;	3372	our @ISA = CFPlus::UI::HBox::;
3053		3373
3054	# TODO: should actualyl wrap buttons and other goodies.	3374	# TODO: should actually wrap buttons and other goodies.
3055		3375
3056	#############################################################################	3376	#############################################################################
3057		3377
3058	package CFClient::UI::Menu;	3378	package CFPlus::UI::Menu;
3059		3379
3060	our @ISA = CFClient::UI::FancyFrame::;	3380	our @ISA = CFPlus::UI::Toplevel::;
3061		3381
3062	use CFClient::OpenGL;	3382	use CFPlus::OpenGL;
3063		3383
3064	sub new {	3384	sub new {
3065	my $class = shift;	3385	my $class = shift;
3066		3386
3067	my $self = $class->SUPER::new (	3387	my $self = $class->SUPER::new (
3068	items => [],	3388	items => [],
3069	z => 100,	3389	z => 100,
3070	@_,	3390	@_,
3071	);	3391	);
3072		3392
3073	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3393	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3074		3394
3075	for my $item (@{ $self->{items} }) {	3395	for my $item (@{ $self->{items} }) {
3076	my ($widget, $cb, $tooltip) = @$item;	3396	my ($widget, $cb, $tooltip) = @$item;
3077		3397
3078	# handle various types of items, only text for now	3398	# handle various types of items, only text for now
3079	if (!ref $widget) {	3399	if (!ref $widget) {
3080	if ($widget =~ /\t/) {	3400	if ($widget =~ /\t/) {
3081	my ($left, $right) = split /\t/, $widget, 2;	3401	my ($left, $right) = split /\t/, $widget, 2;
3082		3402
3083	$widget = new CFClient::UI::HBox	3403	$widget = new CFPlus::UI::HBox
3084	can_hover => 1,	3404	can_hover => 1,
3085	can_events => 1,	3405	can_events => 1,
3086	tooltip => $tooltip,	3406	tooltip => $tooltip,
3087	children => [	3407	children => [
3088	(new CFClient::UI::Label markup => $left, expand => 1),	3408	(new CFPlus::UI::Label markup => $left, expand => 1),
3089	(new CFClient::UI::Label markup => $right, align => +1),	3409	(new CFPlus::UI::Label markup => $right, align => +1),
3090	],	3410	],
3091	;	3411	;
3092		3412
3093	} else {	3413	} else {
3094	$widget = new CFClient::UI::Label	3414	$widget = new CFPlus::UI::Label
3095	can_hover => 1,	3415	can_hover => 1,
3096	can_events => 1,	3416	can_events => 1,
3097	markup => $widget,	3417	markup => $widget,
3098	tooltip => $tooltip;	3418	tooltip => $tooltip;
3099	}	3419	}
…		…
3147	1	3467	1
3148	}	3468	}
3149		3469
3150	#############################################################################	3470	#############################################################################
3151		3471
3152	package CFClient::UI::Multiplexer;	3472	package CFPlus::UI::Multiplexer;
3153		3473
3154	our @ISA = CFClient::UI::Container::;	3474	our @ISA = CFPlus::UI::Container::;
3155		3475
3156	sub new {	3476	sub new {
3157	my $class = shift;	3477	my $class = shift;
3158		3478
3159	my $self = $class->SUPER::new (	3479	my $self = $class->SUPER::new (
…		…
3220	$self->{current}->draw;	3540	$self->{current}->draw;
3221	}	3541	}
3222		3542
3223	#############################################################################	3543	#############################################################################
3224		3544
3225	package CFClient::UI::Notebook;	3545	package CFPlus::UI::Notebook;
3226		3546
3227	our @ISA = CFClient::UI::VBox::;	3547	our @ISA = CFPlus::UI::VBox::;
3228		3548
3229	sub new {	3549	sub new {
3230	my $class = shift;	3550	my $class = shift;
3231		3551
3232	my $self = $class->SUPER::new (	3552	my $self = $class->SUPER::new (
3233	buttonbar => (new CFClient::UI::Buttonbar),	3553	buttonbar => (new CFPlus::UI::Buttonbar),
3234	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3554	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3235	# filter => # will be put between multiplexer and $self	3555	# filter => # will be put between multiplexer and $self
3236	@_,	3556	@_,
3237	);	3557	);
3238		3558
3239	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3559	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3243	}	3563	}
3244		3564
3245	sub add {	3565	sub add {
3246	my ($self, $title, $widget, $tooltip) = @_;	3566	my ($self, $title, $widget, $tooltip) = @_;
3247		3567
3248	Scalar::Util::weaken $self;	3568	CFPlus::weaken $self;
3249		3569
3250	$self->{buttonbar}->add (new CFClient::UI::Button	3570	$self->{buttonbar}->add (new CFPlus::UI::Button
3251	markup => $title,	3571	markup => $title,
3252	tooltip => $tooltip,	3572	tooltip => $tooltip,
3253	on_activate => sub { $self->set_current_page ($widget) },	3573	on_activate => sub { $self->set_current_page ($widget) },
3254	);	3574	);
3255		3575
…		…
3269	$self->emit (page_changed => $self->{multiplexer}{current});	3589	$self->emit (page_changed => $self->{multiplexer}{current});
3270	}	3590	}
3271		3591
3272	#############################################################################	3592	#############################################################################
3273		3593
3274	package CFClient::UI::Combobox;	3594	package CFPlus::UI::Selector;
3275		3595
3276	use utf8;	3596	use utf8;
3277		3597
3278	our @ISA = CFClient::UI::Button::;	3598	our @ISA = CFPlus::UI::Button::;
3279		3599
3280	sub new {	3600	sub new {
3281	my $class = shift;	3601	my $class = shift;
3282		3602
3283	my $self = $class->SUPER::new (	3603	my $self = $class->SUPER::new (
…		…
3300	my ($value, $title, $tooltip) = @$_;	3620	my ($value, $title, $tooltip) = @$_;
3301		3621
3302	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3622	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303	}	3623	}
3304		3624
3305	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3625	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306	}	3626	}
3307		3627
3308	sub _set_value {	3628	sub _set_value {
3309	my ($self, $value) = @_;	3629	my ($self, $value) = @_;
3310		3630
…		…
3325	$self->emit (changed => $value);	3645	$self->emit (changed => $value);
3326	}	3646	}
3327		3647
3328	#############################################################################	3648	#############################################################################
3329		3649
3330	package CFClient::UI::Statusbox;	3650	package CFPlus::UI::Statusbox;
3331		3651
3332	our @ISA = CFClient::UI::VBox::;	3652	our @ISA = CFPlus::UI::VBox::;
3333		3653
3334	sub new {	3654	sub new {
3335	my $class = shift;	3655	my $class = shift;
3336		3656
3337	my $self = $class->SUPER::new (	3657	my $self = $class->SUPER::new (
3338	fontsize => 0.8,	3658	fontsize => 0.8,
3339	@_,	3659	@_,
3340	);	3660	);
3341		3661
3342	Scalar::Util::weaken (my $this = $self);	3662	CFPlus::weaken (my $this = $self);
3343		3663
3344	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3664	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3345		3665
3346	$self	3666	$self
3347	}	3667	}
…		…
3349	sub reorder {	3669	sub reorder {
3350	my ($self) = @_;	3670	my ($self) = @_;
3351	my $NOW = Time::HiRes::time;	3671	my $NOW = Time::HiRes::time;
3352		3672
3353	# freeze display when hovering over any label	3673	# freeze display when hovering over any label
3354	return if $CFClient::UI::TOOLTIP->{owner}	3674	return if $CFPlus::UI::TOOLTIP->{owner}
3355	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3675	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3356	values %{ $self->{item} };	3676	values %{ $self->{item} };
3357		3677
3358	while (my ($k, $v) = each %{ $self->{item} }) {	3678	while (my ($k, $v) = each %{ $self->{item} }) {
3359	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3679	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3360	}	3680	}
…		…
3381	for ($short) {	3701	for ($short) {
3382	s/^\s+//;	3702	s/^\s+//;
3383	s/\s+/ /g;	3703	s/\s+/ /g;
3384	}	3704	}
3385		3705
3386	new CFClient::UI::Label	3706	new CFPlus::UI::Label
3387	markup => $short,	3707	markup => $short,
3388	tooltip => $item->{tooltip},	3708	tooltip => $item->{tooltip},
3389	tooltip_font => $::FONT_PROP,	3709	tooltip_font => $::FONT_PROP,
3390	tooltip_width => 0.67,	3710	tooltip_width => 0.67,
3391	fontsize => $item->{fontsize} || $self->{fontsize},	3711	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3470	$self->SUPER::destroy;	3790	$self->SUPER::destroy;
3471	}	3791	}
3472		3792
3473	#############################################################################	3793	#############################################################################
3474		3794
3475	package CFClient::UI::Inventory;
3476
3477	our @ISA = CFClient::UI::Table::;
3478
3479	sub new {
3480	my $class = shift;
3481
3482	my $self = $class->SUPER::new (
3483	col_expand => [0, 1, 0],
3484	@_,
3485	);
3486
3487	$self
3488	}
3489
3490	sub set_items {
3491	my ($self, $items) = @_;
3492
3493	$self->clear;
3494	return unless $items;
3495
3496	my @items = sort {
3497	($a->{type} <=> $b->{type})
3498	or ($a->{name} cmp $b->{name})
3499	} values %$items;
3500
3501	$self->{real_items} = \@items;
3502
3503	my $row = 0;
3504	for my $item (@items) {
3505	CFClient::Item::update_widgets $item;
3506
3507	$self->add (0, $row, $item->{face_widget});
3508	$self->add (1, $row, $item->{desc_widget});
3509	$self->add (2, $row, $item->{weight_widget});
3510
3511	$row++;
3512	}
3513	}
3514
3515	#############################################################################
3516
3517	package CFClient::UI::SpellList;
3518
3519	our @ISA = CFClient::UI::Table::;
3520
3521	sub new {
3522	my $class = shift;
3523
3524	my $self = $class->SUPER::new (
3525	binding => [],
3526	commands => [],
3527	@_,
3528	)
3529	}
3530
3531	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3532
3533	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3534	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3535	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3537	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3539	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3541	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3543
3544	sub rebuild_spell_list {
3545	my ($self) = @_;
3546
3547	$CFClient::UI::ROOT->on_refresh ($self => sub {
3548	$self->clear;
3549
3550	return unless $::CONN;
3551
3552	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3553	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3554	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3555	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3556	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3557
3558	my $row = 0;
3559
3560	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3561	my $spell = $self->{spell}{$_};
3562
3563	$row++;
3564
3565	my $spell_cb = sub {
3566	my ($widget, $ev) = @_;
3567
3568	if ($ev->{button} == 1) {
3569	$::CONN->user_send ("cast $spell->{name}");
3570	} elsif ($ev->{button} == 2) {
3571	$::CONN->user_send ("invoke $spell->{name}");
3572	} elsif ($ev->{button} == 3) {
3573	(new CFClient::UI::Menu
3574	items => [
3575	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3576	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3577	],
3578	)->popup ($ev);
3579	} else {
3580	return 0;
3581	}
3582
3583	1
3584	};
3585
3586	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3587
3588	#TODO: add path info to tooltip
3589	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3590
3591	$self->add (0, $row, new CFClient::UI::Face
3592	face => $spell->{face},
3593	can_hover => 1,
3594	can_events => 1,
3595	tooltip => $tooltip,
3596	on_button_down => $spell_cb,
3597	);
3598
3599	$self->add (1, $row, new CFClient::UI::Label
3600	expand => 1,
3601	text => $spell->{name},
3602	can_hover => 1,
3603	can_events => 1,
3604	tooltip => $tooltip,
3605	on_button_down => $spell_cb,
3606	);
3607
3608	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3609	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3610	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3611	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3612	}
3613	});
3614	}
3615
3616	sub add_spell {
3617	my ($self, $spell) = @_;
3618
3619	$self->{spell}->{$spell->{name}} = $spell;
3620	$self->rebuild_spell_list;
3621	}
3622
3623	sub remove_spell {
3624	my ($self, $spell) = @_;
3625
3626	delete $self->{spell}->{$spell->{name}};
3627	$self->rebuild_spell_list;
3628	}
3629
3630	sub clear_spells {
3631	my ($self) = @_;
3632
3633	$self->{spell} = {};
3634	$self->rebuild_spell_list;
3635	}
3636
3637	#############################################################################
3638
3639	package CFClient::UI::Root;	3795	package CFPlus::UI::Root;
3640		3796
3641	our @ISA = CFClient::UI::Container::;	3797	our @ISA = CFPlus::UI::Container::;
3642		3798
3643	use List::Util qw(min max);	3799	use List::Util qw(min max);
3644		3800
3645	use CFClient::OpenGL;	3801	use CFPlus::OpenGL;
3646		3802
3647	sub new {	3803	sub new {
3648	my $class = shift;	3804	my $class = shift;
3649		3805
3650	my $self = $class->SUPER::new (	3806	my $self = $class->SUPER::new (
3651	visible => 1,	3807	visible => 1,
3652	@_,	3808	@_,
3653	);	3809	);
3654		3810
3655	Scalar::Util::weaken ($self->{root} = $self);	3811	CFPlus::weaken ($self->{root} = $self);
3656		3812
3657	$self	3813	$self
3658	}	3814	}
3659		3815
3660	sub size_request {	3816	sub size_request {
…		…
3829	$h = 0 if $h < 0;	3985	$h = 0 if $h < 0;
3830		3986
3831	$w = max $widget->{min_w}, $w;	3987	$w = max $widget->{min_w}, $w;
3832	$h = max $widget->{min_h}, $h;	3988	$h = max $widget->{min_h}, $h;
3833		3989
		3990	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3991	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3992
3834	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	3993	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	3994	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3836		3995
3837	$w = int $w + 0.5;	3996	$w = int $w + 0.5;
3838	$h = int $h + 0.5;	3997	$h = int $h + 0.5;
…		…
3864	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4023	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3865	glMatrixMode GL_MODELVIEW;	4024	glMatrixMode GL_MODELVIEW;
3866	glLoadIdentity;	4025	glLoadIdentity;
3867		4026
3868	{	4027	{
3869	package CFClient::UI::Base;	4028	package CFPlus::UI::Base;
3870		4029
3871	($draw_x, $draw_y, $draw_w, $draw_h) =	4030	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3872	(0, 0, $self->{w}, $self->{h});	4031	(0, 0, $self->{w}, $self->{h});
3873	}
3874		4032
3875	$self->_draw;	4033	$self->_draw;
		4034	}
3876	}	4035	}
3877		4036
3878	#############################################################################	4037	#############################################################################
3879		4038
3880	package CFClient::UI;	4039	package CFPlus::UI;
3881		4040
3882	$ROOT = new CFClient::UI::Root;	4041	$ROOT = new CFPlus::UI::Root;
3883	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4042	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3884		4043
3885	1	4044	1
3886		4045

Diff Legend

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