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.316 by root, Sun Jul 2 13:57:58 2006 UTC vs.
Revision 1.377 by root, Mon Jul 16 20:20:30 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
98		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	# mousewheel
100	if $GRAB;	118	$ev->{dx} = 0;
		119	$ev->{dy} = $ev->{button} * 2 - 9;
		120	$GRAB->emit (mouse_wheel => $ev);
		121	} else {
		122	$GRAB->emit (button_down => $ev)
		123	}
		124	}
101	}	125	}
102		126
103	sub feed_sdl_button_up_event {	127	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	128	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		129
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	130	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		131
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	132	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		133
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	134	$GRAB->emit (button_up => $ev)
112	if $GRAB;	135	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		136
114	if (!$BUTTON_STATE) {	137	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	138	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	139	$grab->update if $grab;
117	$GRAB->update if $GRAB;	140	$GRAB->update if $GRAB;
118		141
		142	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	143	$TOOLTIP_WATCHER->cb->();
120	}	144	}
121	}	145	}
122		146
123	sub feed_sdl_motion_event {	147	sub feed_sdl_motion_event {
124	my ($ev) = @_;	148	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	149	my ($x, $y) = ($ev->{x}, $ev->{y});
126		150
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	151	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		152
129	if ($widget != $HOVER) {	153	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		154
132	$hover->update if $hover && $hover->{can_hover};	155	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	156	if $HOVER;
140	}	157	}
141		158
142	# convert position array to integers	159	# convert position array to integers
143	sub harmonize {	160	sub harmonize {
…		…
193	reconfigure_widgets;	210	reconfigure_widgets;
194	}	211	}
195		212
196	#############################################################################	213	#############################################################################
197		214
		215	package CFPlus::UI::Event;
		216
		217	sub xy {
		218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		219	}
		220
		221	#############################################################################
		222
198	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
199		224
200	use strict;	225	use strict;
201		226
202	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
203		228
204	sub new {	229	sub new {
205	my $class = shift;	230	my $class = shift;
206		231
207	my $self = bless {	232	my $self = bless {
…		…
212	h => undef,	237	h => undef,
213	can_events => 1,	238	can_events => 1,
214	@_	239	@_
215	}, $class;	240	}, $class;
216		241
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		243
219	for (keys %$self) {	244	for (keys %$self) {
220	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
222	}	247	}
223	}	248	}
224		249
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	252	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	253	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		255
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		258
234	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
239		264
240	sub destroy {	265	sub destroy {
241	my ($self) = @_;	266	my ($self) = @_;
242		267
243	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
244	%$self = ();	270	%$self = ();
245	}	271	}
246		272
		273	sub TO_JSON {
		274	{ __widget_ref__ => $_[0]{s_id} }
		275	}
		276
247	sub show {	277	sub show {
248	my ($self) = @_;	278	my ($self) = @_;
249		279
250	return if $self->{parent};	280	return if $self->{parent};
251		281
252	$CFClient::UI::ROOT->add ($self);	282	$CFPlus::UI::ROOT->add ($self);
253	}	283	}
254		284
255	sub set_visible {	285	sub set_visible {
256	my ($self) = @_;	286	my ($self) = @_;
257		287
…		…
278	delete $self->{root};	308	delete $self->{root};
279		309
280	undef $GRAB if $GRAB == $self;	310	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	311	undef $HOVER if $HOVER == $self;
282		312
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	314	if $TOOLTIP->{owner} == $self;
285		315
286	$self->emit ("focus_out");	316	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
288	}	318	}
…		…
290	sub set_visibility {	320	sub set_visibility {
291	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
292		322
293	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
294		324
295	$visible ? $self->hide	325	$visible ? $self->show
296	: $self->show;	326	: $self->hide;
297	}	327	}
298		328
299	sub toggle_visibility {	329	sub toggle_visibility {
300	my ($self) = @_;	330	my ($self) = @_;
301		331
…		…
345	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
346		376
347	if ($self->{aspect}) {	377	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
349		379
350	$w = List::Util::min $w, int $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		382
353	# use alignment to adjust x, y	383	# use alignment to adjust x, y
354		384
355	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
397		427
398	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
399		429
400	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
401		431
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	435	}
406	}	436	}
407		437
408	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
409	sub coord2local {	439	sub coord2local {
410	my ($self, $x, $y) = @_;	440	my ($self, $x, $y) = @_;
411		441
		442	Carp::confess unless $self->{parent};#d#
		443
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	445	}
414		446
415	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
416	sub coord2global {	448	sub coord2global {
417	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
418		450
		451	Carp::confess unless $self->{parent};#d#
		452
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	454	}
421		455
422	sub invoke_focus_in {	456	sub invoke_focus_in {
423	my ($self) = @_;	457	my ($self) = @_;
424		458
425	return if $FOCUS == $self;	459	return if $FOCUS == $self;
426	return unless $self->{can_focus};	460	return unless $self->{can_focus};
427		461
428	my $focus = $FOCUS; $FOCUS = $self;	462	$FOCUS = $self;
429		463
430	$focus->update if $focus;	464	$self->update;
431	$FOCUS->update;
432		465
433	0	466	0
434	}	467	}
435		468
436	sub invoke_focus_out {	469	sub invoke_focus_out {
437	my ($self) = @_;	470	my ($self) = @_;
438		471
439	return unless $FOCUS == $self;	472	return unless $FOCUS == $self;
440		473
441	my $focus = $FOCUS; undef $FOCUS;	474	undef $FOCUS;
442		475
443	$focus->update if $focus; #?	476	$self->update;
444		477
445	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	478	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446	unless $FOCUS;	479	unless $FOCUS;
447		480
448	0	481	0
449	}	482	}
450		483
451	sub grab_focus {	484	sub grab_focus {
452	my ($self) = @_;	485	my ($self) = @_;
453		486
		487	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	488	$self->emit ("focus_in");
455	}	489	}
456		490
457	sub invoke_mouse_motion { 1 }	491	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	492	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	493	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	494	sub invoke_key_up { 0 }
		495	sub invoke_mouse_wheel { 0 }
461		496
462	sub invoke_button_down {	497	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	498	my ($self, $ev, $x, $y) = @_;
464		499
465	$self->grab_focus;	500	$self->grab_focus;
466		501
467	1	502	0
468	}	503	}
469		504
470	sub connect {	505	sub connect {
471	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
472		507
473	push @{ $self->{signal_cb}{$signal} }, $cb;	508	push @{ $self->{signal_cb}{$signal} }, $cb;
		509
		510	defined wantarray and CFPlus::guard {
		511	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		512	@{ $self->{signal_cb}{$signal} };
		513	}
474	}	514	}
		515
		516	sub disconnect_all {
		517	my ($self, $signal) = @_;
		518
		519	delete $self->{signal_cb}{$signal};
		520	}
		521
		522	my %has_coords = (
		523	button_down => 1,
		524	button_up => 1,
		525	mouse_motion => 1,
		526	mouse_wheel => 1,
		527	);
475		528
476	sub emit {	529	sub emit {
477	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
478		531
479	#d##TODO# stop propagating at first true, do not use sum	532	# I do not really like this solution, but I do not like duplication
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	533	# and needlessly verbose code, either.
		534	my @append
		535	= $has_coords{$signal}
		536	? $args[0]->xy ($self)
		537	: ();
		538
		539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		540
		541	for my $cb (
		542	@{$self->{signal_cb}{$signal} || []}, # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	543	($self->can ("invoke_$signal") || sub { 1 }), # closure
		544	) {
		545	return $cb->($self, @args, @append) || next;
		546	}
		547
		548	# parent
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	550	}
484		551
485	sub find_widget {	552	sub find_widget {
486	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
487		554
…		…
495	}	562	}
496		563
497	sub set_parent {	564	sub set_parent {
498	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
499		566
500	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
502	}	569	}
503		570
504	sub realloc {	571	sub realloc {
505	my ($self) = @_;	572	my ($self) = @_;
…		…
571	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
574	glEnd;	641	glEnd;
575	glPopMatrix;	642	glPopMatrix;
576	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	643	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577	}	644	}
578		645
579	$self->_draw;	646	$self->_draw;
580	glPopMatrix;	647	glPopMatrix;
581	}	648	}
…		…
584	my ($self) = @_;	651	my ($self) = @_;
585		652
586	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
587	}	654	}
588		655
		656	my $cntx;#d#
589	sub DESTROY {	657	sub DESTROY {
590	my ($self) = @_;	658	my ($self) = @_;
591		659
592	delete $WIDGET{$self+0};	660	return if CFPlus::in_destruct;
593		661
594	eval { $self->destroy };	662	eval { $self->destroy };
595	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};
596	}	666	}
597		667
598	#############################################################################	668	#############################################################################
599		669
600	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
601		671
602	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
603		673
604	use strict;	674	use strict;
605	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
606		676
607	sub new {	677	sub new {
608	my $class = shift;	678	my $class = shift;
609		679
610	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
641	}	711	}
642	}	712	}
643		713
644	#############################################################################	714	#############################################################################
645		715
646	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
647		717
648	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
649		719
650	sub new {	720	sub new {
651	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
653	}	723	}
…		…
660		730
661	sub draw { }	731	sub draw { }
662		732
663	#############################################################################	733	#############################################################################
664		734
665	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
666		736
667	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
668		738
669	sub new {	739	sub new {
670	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
671		741
672	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
681	if $children;	751	if $children;
682		752
683	$self	753	$self
684	}	754	}
685		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
686	sub add {	764	sub add {
687	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
688		766
689	$_->set_parent ($self)	767	$_->set_parent ($self)
690	for @widgets;	768	for @widgets;
…		…
750	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
751	}	829	}
752		830
753	#############################################################################	831	#############################################################################
754		832
755	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
756		834
757	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
758		836
759	sub new {	837	sub new {
760	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
761		839
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		841
764	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
765	}	843	}
766		844
767	sub add {	845	sub add {
…		…
774	sub remove {	852	sub remove {
775	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
776		854
777	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
778		856
779	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
780	unless @{$self->{children}};	858	unless @{$self->{children}};
781	}	859	}
782		860
783	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
784		862
…		…
796		874
797	#############################################################################	875	#############################################################################
798		876
799	# back-buffered drawing area	877	# back-buffered drawing area
800		878
801	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
802		880
803	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
804		882
805	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
806		884
807	sub new {	885	sub new {
808	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
809		887
810	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
832	}	910	}
833		911
834	sub render_child {	912	sub render_child {
835	my ($self) = @_;	913	my ($self) = @_;
836		914
837	$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 {
838	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
840		918
841	{	919	{
842	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
843		921
844	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
846	}	926	}
847
848	$self->_render;
849	};	927	};
850	}	928	}
851		929
852	sub _draw {	930	sub _draw {
853	my ($self) = @_;	931	my ($self) = @_;
854
855	my ($w, $h) = @$self{qw(w h)};
856		932
857	my $tex = $self->{texture}	933	my $tex = $self->{texture}
858	or return;	934	or return;
859		935
860	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
863		939
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
865		941
866	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
867	}	943	}
868		944
869	#############################################################################	945	#############################################################################
870		946
871	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
872		948
		949	use List::Util qw(min max);
		950
873	our @ISA = CFClient::UI::Window::;	951	our @ISA = CFPlus::UI::Window::;
874		952
875	sub new {	953	sub new {
876	my $class = shift;	954	my $class = shift;
877		955
878	$class->SUPER::new (	956	$class->SUPER::new (
…		…
908	}	986	}
909		987
910	sub set_offset {	988	sub set_offset {
911	my ($self, $x, $y) = @_;	989	my ($self, $x, $y) = @_;
912		990
913	$self->{view_x} = int $x;	991	$self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
914	$self->{view_y} = int $y;	992	$self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
915		993
		994	$self->emit (changed => $self->{view_x}, $self->{view_y});
916	$self->update;	995	$self->update;
917	}	996	}
918		997
919	# hmm, this does not work for topleft of $self... but we should not ask for that	998	# hmm, this does not work for topleft of $self... but we should not ask for that
920	sub coord2local {	999	sub coord2local {
…		…
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1019	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1020	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	1021	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1022	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1023	}
945	}	1024	}
946		1025
947	sub _render {	1026	sub _render {
948	my ($self) = @_;	1027	my ($self) = @_;
949		1028
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1029	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1030	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1031
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1032	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1033
955	$self->SUPER::_render;	1034	$self->SUPER::_render;
956	}	1035	}
957		1036
958	#############################################################################	1037	#############################################################################
959		1038
960	package CFClient::UI::ScrolledWindow;	1039	package CFPlus::UI::ScrolledWindow;
961		1040
962	our @ISA = CFClient::UI::HBox::;	1041	our @ISA = CFPlus::UI::Table::;
963		1042
964	sub new {	1043	sub new {
965	my ($class, %arg) = @_;	1044	my ($class, %arg) = @_;
966		1045
967	my $child = delete $arg{child};	1046	my $child = delete $arg{child};
968		1047
969	my $self;	1048	my $self;
970		1049
971	my $slider = new CFClient::UI::Slider	1050	my $hslider = new CFPlus::UI::Slider
		1051	vertical => 0,
		1052	range => [0, 0, 1, 0.01], # HACK fix
		1053	on_changed => sub {
		1054	$self->{hpos} = $_[1];
		1055	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1056	},
		1057	;
		1058
		1059	my $vslider = new CFPlus::UI::Slider
972	vertical => 1,	1060	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1061	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1062	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1063	$self->{vpos} = $_[1];
		1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976	},	1065	},
977	;	1066	;
978		1067
979	$self = $class->SUPER::new (	1068	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1069	scroll_x => 0,
		1070	scroll_y => 1,
		1071	can_events => 1,
981	slider => $slider,	1072	hslider => $hslider,
		1073	vslider => $vslider,
		1074	col_expand => [1, 0],
		1075	row_expand => [1, 0],
982	%arg,	1076	%arg,
983	);	1077	);
984		1078
		1079	$self->{vp} = new CFPlus::UI::ViewPort
		1080	expand => 1,
		1081	scroll_x => $self->{scroll_x},
		1082	scroll_y => $self->{scroll_y},
		1083	on_changed => sub {
		1084	my ($vp, $x, $y) = @_;
		1085
		1086	$vp->{parent}{hslider}->set_value ($x);
		1087	$vp->{parent}{vslider}->set_value ($y);
		1088
		1089	0
		1090	},
		1091	;
		1092
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1093	$self->SUPER::add (0, 0, $self->{vp});
		1094
986	$self->add ($child) if $child;	1095	$self->add ($child) if $child;
987		1096
988	$self	1097	$self
989	}	1098	}
990		1099
…		…
997	}	1106	}
998		1107
999	sub update_slider {	1108	sub update_slider {
1000	my ($self) = @_;	1109	my ($self) = @_;
1001		1110
		1111	my $child = ($self->{vp} or return)->child;
		1112
		1113	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1114	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1115
		1116	my $visible = $w1 > $w2;
		1117	if ($visible != $self->{hslider}{visible}) {
		1118	$visible ? $self->SUPER::add (0, 1, $self->{hslider})
		1119	: $self->{hslider}->hide;
		1120	}
		1121
		1122	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1123	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1124
		1125	my $visible = $h1 > $h2;
		1126	if ($visible != $self->{vslider}{visible}) {
		1127	$visible ? $self->SUPER::add (1, 0, $self->{vslider})
		1128	: $self->{vslider}->hide;
		1129	}
1003	}	1130	}
1004		1131
1005	sub update {	1132	sub update {
1006	my ($self) = @_;	1133	my ($self) = @_;
1007		1134
1008	$self->SUPER::update;	1135	$self->SUPER::update;
1009
1010	$self->update_slider;	1136	$self->update_slider;
		1137	}
		1138
		1139	sub invoke_mouse_wheel {
		1140	my ($self, $ev) = @_;
		1141
		1142	return 0 unless $ev->{dy}; # only vertical movements for now
		1143
		1144	$self->{vslider}->emit (mouse_wheel => $ev);
		1145
		1146	1
		1147	}
		1148
		1149	sub invoke_button_down {
		1150	my ($self, $ev, $x, $y) = @_;
		1151
		1152	if ($ev->{button} == 2) {
		1153	$self->grab_focus;
		1154
		1155	my $ox = $self->{vp}{view_x} + $ev->{x};
		1156	my $oy = $self->{vp}{view_y} + $ev->{y};
		1157
		1158	$self->{motion} = sub {
		1159	my ($ev, $x, $y) = @_;
		1160
		1161	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1162	$self->update;
		1163	};
		1164
		1165	return 1;
		1166	}
		1167
		1168	0
		1169	}
		1170
		1171	sub invoke_button_up {
		1172	my ($self, $ev, $x, $y) = @_;
		1173
		1174	if (delete $self->{motion}) {
		1175	return 1;
		1176	}
		1177
		1178	0
		1179	}
		1180
		1181	sub invoke_mouse_motion {
		1182	my ($self, $ev, $x, $y) = @_;
		1183
		1184	if ($self->{motion}) {
		1185	$self->{motion}->($ev, $x, $y);
		1186	return 1;
		1187	}
		1188
		1189	0
1011	}	1190	}
1012		1191
1013	sub invoke_size_allocate {	1192	sub invoke_size_allocate {
1014	my ($self, $w, $h) = @_;	1193	my ($self, $w, $h) = @_;
1015		1194
1016	$self->update_slider;	1195	$self->update_slider;
1017
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1196	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1197	}
1020		1198
1021	#############################################################################	1199	#############################################################################
1022		1200
1023	package CFClient::UI::Frame;	1201	package CFPlus::UI::Frame;
1024		1202
1025	our @ISA = CFClient::UI::Bin::;	1203	our @ISA = CFPlus::UI::Bin::;
1026		1204
1027	use CFClient::OpenGL;	1205	use CFPlus::OpenGL;
1028		1206
1029	sub new {	1207	sub new {
1030	my $class = shift;	1208	my $class = shift;
1031		1209
1032	$class->SUPER::new (	1210	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1236	$self->SUPER::_draw;
1059	}	1237	}
1060		1238
1061	#############################################################################	1239	#############################################################################
1062		1240
1063	package CFClient::UI::FancyFrame;	1241	package CFPlus::UI::FancyFrame;
1064		1242
1065	our @ISA = CFClient::UI::Bin::;	1243	our @ISA = CFPlus::UI::Bin::;
1066		1244
1067	use CFClient::OpenGL;	1245	use CFPlus::OpenGL;
		1246
		1247	sub new {
		1248	my ($class, %arg) = @_;
		1249
		1250	if ((exists $arg{label}) && !ref $arg{label}) {
		1251	$arg{label} = new CFPlus::UI::Label
		1252	align => 1,
		1253	valign => 0,
		1254	text => $arg{label},
		1255	fontsize => ($arg{border} || 0.8) * 0.75;
		1256	}
		1257
		1258	my $self = $class->SUPER::new (
		1259	# label => "",
		1260	fg => [0.6, 0.3, 0.1],
		1261	border => 0.8,
		1262	style => 'single',
		1263	%arg,
		1264	);
		1265
		1266	$self
		1267	}
		1268
		1269	sub add {
		1270	my ($self, @widgets) = @_;
		1271
		1272	$self->SUPER::add (@widgets);
		1273	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1274	}
		1275
		1276	sub border {
		1277	int $_[0]{border} * $::FONTSIZE
		1278	}
		1279
		1280	sub size_request {
		1281	my ($self) = @_;
		1282
		1283	($self->{label_w}, undef) = $self->{label}->size_request
		1284	if $self->{label};
		1285
		1286	my ($w, $h) = $self->SUPER::size_request;
		1287
		1288	(
		1289	$w + $self->border * 2,
		1290	$h + $self->border * 2,
		1291	)
		1292	}
		1293
		1294	sub invoke_size_allocate {
		1295	my ($self, $w, $h) = @_;
		1296
		1297	my $border = $self->border;
		1298
		1299	$w -= List::Util::max 0, $border * 2;
		1300	$h -= List::Util::max 0, $border * 2;
		1301
		1302	if (my $label = $self->{label}) {
		1303	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1304	$label->{h} = List::Util::min $h, $border;
		1305	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1306	}
		1307
		1308	$self->child->configure ($border, $border, $w, $h);
		1309
		1310	1
		1311	}
		1312
		1313	sub _draw {
		1314	my ($self) = @_;
		1315
		1316	my $child = $self->{children}[0];
		1317
		1318	my $border = $self->border;
		1319	my ($w, $h) = ($self->{w}, $self->{h});
		1320
		1321	$child->draw;
		1322
		1323	glColor @{$self->{fg}};
		1324	glBegin GL_LINE_STRIP;
		1325	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1326	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1327	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1328	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1329	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1330	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1331	glEnd;
		1332
		1333	if ($self->{label}) {
		1334	glTranslate $border * 2, 0;
		1335	$self->{label}->_draw;
		1336	}
		1337	}
		1338
		1339	#############################################################################
		1340
		1341	package CFPlus::UI::Toplevel;
		1342
		1343	our @ISA = CFPlus::UI::Bin::;
		1344
		1345	use CFPlus::OpenGL;
1068		1346
1069	my $bg =	1347	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1348	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1349	mipmap => 1, wrap => 1;
1072		1350
1073	my @border =	1351	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1352	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1353	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076		1354
1077	sub new {	1355	sub new {
1078	my ($class, %arg) = @_;	1356	my ($class, %arg) = @_;
1079		1357
1080	my $self = $class->SUPER::new (	1358	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1359	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1360	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1361	border => 0.6,
1084	can_events => 1,	1362	can_events => 1,
1085	min_w => 16,	1363	min_w => 64,
1086	min_h => 16,	1364	min_h => 32,
1087	%arg,	1365	%arg,
1088	);	1366	);
1089		1367
1090	$self->{title_widget} = new CFClient::UI::Label	1368	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1369	align => 0,
1092	valign => 1,	1370	valign => 1,
1093	text => $self->{title},	1371	text => $self->{title},
1094	fontsize => $self->{border},	1372	fontsize => $self->{border},
1095	if exists $self->{title};	1373	if exists $self->{title};
1096		1374
1097	if ($self->{has_close_button}) {	1375	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1376	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1377	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1378	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1379	on_activate => sub { $self->emit ("delete") };
1102		1380
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1381	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1382	}
1105		1383
1106	$self	1384	$self
1107	}	1385	}
1108		1386
1109	sub add {	1387	sub add {
1110	my ($self, @widgets) = @_;	1388	my ($self, @widgets) = @_;
1111		1389
1112	$self->SUPER::add (@widgets);	1390	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1391	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1392	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1393	}
1116		1394
1117	sub border {	1395	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1396	int $_[0]{border} * $::FONTSIZE
1119	}	1397	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1430	$self->child->configure ($border, $border, $w, $h);
1153		1431
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1432	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1433	if $self->{close_button};
1156		1434
		1435	1
		1436	}
		1437
		1438	sub invoke_delete {
		1439	my ($self) = @_;
		1440
		1441	$self->hide;
		1442
1157	1	1443	1
1158	}	1444	}
1159		1445
1160	sub invoke_button_down {	1446	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1447	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1505	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1506
1221	! ! $self->{motion}	1507	! ! $self->{motion}
1222	}	1508	}
1223		1509
		1510	sub invoke_visibility_change {
		1511	my ($self, $visible) = @_;
		1512
		1513	delete $self->{motion} unless $visible;
		1514
		1515	0
		1516	}
		1517
1224	sub _draw {	1518	sub _draw {
1225	my ($self) = @_;	1519	my ($self) = @_;
1226		1520
1227	my $child = $self->{children}[0];	1521	my $child = $self->{children}[0];
1228		1522
…		…
1265	if $self->{close_button};	1559	if $self->{close_button};
1266	}	1560	}
1267		1561
1268	#############################################################################	1562	#############################################################################
1269		1563
1270	package CFClient::UI::Table;	1564	package CFPlus::UI::Table;
1271		1565
1272	our @ISA = CFClient::UI::Base::;	1566	our @ISA = CFPlus::UI::Base::;
1273		1567
1274	use List::Util qw(max sum);	1568	use List::Util qw(max sum);
1275		1569
1276	use CFClient::OpenGL;	1570	use CFPlus::OpenGL;
1277		1571
1278	sub new {	1572	sub new {
1279	my $class = shift;	1573	my $class = shift;
1280		1574
1281	$class->SUPER::new (	1575	$class->SUPER::new (
		1576	children => [],
1282	col_expand => [],	1577	col_expand => [],
		1578	row_expand => [],
1283	@_,	1579	@_,
1284	)	1580	)
1285	}	1581	}
1286		1582
1287	sub children {	1583	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1584	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}	1585	}
1290		1586
		1587	# TODO: store row/col info in child widget and use standard add/del
1291	sub add {	1588	sub add {
1292	my ($self, $x, $y, $child) = @_;	1589	my ($self) = shift;
1293		1590
		1591	while (@_) {
		1592	my ($x, $y, $child) = splice @_, 0, 3, ();
1294	$child->set_parent ($self);	1593	$child->set_parent ($self);
1295	$self->{children}[$y][$x] = $child;	1594	$self->{children}[$y][$x] = $child;
		1595	}
1296		1596
		1597	$self->{force_realloc} = 1;
		1598	$self->{force_size_alloc} = 1;
1297	$self->realloc;	1599	$self->realloc;
1298	}	1600	}
1299		1601
1300	sub remove {	1602	sub remove {
1301	my ($self, $child) = @_;	1603	my ($self, $child) = @_;
1302		1604
1303	# TODO: not yet implemented	1605	for (@{ $self->{children} }) {
		1606	for (@{ $_ || [] }) {
		1607	$_ = undef if $_ == $child;
		1608	}
		1609	}
1304	}	1610	}
1305		1611
1306	# TODO: move to container class maybe? send children a signal on removal?	1612	# TODO: move to container class maybe? send children a signal on removal?
1307	sub clear {	1613	sub clear {
1308	my ($self) = @_;	1614	my ($self) = @_;
…		…
1357	my ($ws, $hs) = $self->get_wh;	1663	my ($ws, $hs) = $self->get_wh;
1358		1664
1359	my $req_w = (sum @$ws) || 1;	1665	my $req_w = (sum @$ws) || 1;
1360	my $req_h = (sum @$hs) || 1;	1666	my $req_h = (sum @$hs) || 1;
1361		1667
1362	# TODO: nicer code && do row_expand	1668	# TODO: nicer code
1363	my @col_expand = @{$self->{col_expand}};	1669	my @col_expand = @{$self->{col_expand}};
1364	@col_expand = (1) x @$ws unless @col_expand;	1670	@col_expand = (1) x @$ws unless @col_expand;
1365	my $col_expand = (sum @col_expand) || 1;	1671	my $col_expand = (sum @col_expand) || 1;
1366		1672
1367	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1673	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1674
1371	CFClient::UI::harmonize $ws;	1675	CFPlus::UI::harmonize $ws;
		1676
		1677	my @row_expand = @{$self->{row_expand}};
		1678	@row_expand = (1) x @$ws unless @row_expand;
		1679	my $row_expand = (sum @row_expand) || 1;
		1680
		1681	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1682
1372	CFClient::UI::harmonize $hs;	1683	CFPlus::UI::harmonize $hs;
1373		1684
1374	my $y;	1685	my $y;
1375		1686
1376	for my $r (0 .. $#{$self->{children}}) {	1687	for my $r (0 .. $#{$self->{children}}) {
1377	my $row = $self->{children}[$r]	1688	my $row = $self->{children}[$r]
…		…
1420	}	1731	}
1421	}	1732	}
1422		1733
1423	#############################################################################	1734	#############################################################################
1424		1735
1425	package CFClient::UI::Box;	1736	package CFPlus::UI::Fixed;
1426		1737
		1738	use List::Util qw(min max);
		1739
1427	our @ISA = CFClient::UI::Container::;	1740	our @ISA = CFPlus::UI::Container::;
		1741
		1742	sub add {
		1743	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1744
		1745	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1746	$self->SUPER::add ($child);
		1747	}
		1748
		1749	sub _scale($$$) {
		1750	my ($mode, $val, $max) = @_;
		1751
		1752	$mode eq "abs" ? $val
		1753	: $mode eq "rel" ? $val * $max
		1754	: 0
		1755	}
		1756
		1757	sub size_request {
		1758	my ($self) = @_;
		1759
		1760	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1761
		1762	# determine overall size by querying abs widgets
		1763	for my $child ($self->visible_children) {
		1764	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1765
		1766	if ($pos eq "abs") {
		1767	$w = _scale $size, $w, $child->{req_w};
		1768	$h = _scale $size, $h, $child->{req_h};
		1769
		1770	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1771	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1772	}
		1773	}
		1774
		1775	my $W = $x2 - $x1;
		1776	my $H = $y2 - $y1;
		1777
		1778	# now layout remaining widgets
		1779	for my $child ($self->visible_children) {
		1780	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1781
		1782	if ($pos ne "abs") {
		1783	$x = _scale $pos, $x, $W;
		1784	$y = _scale $pos, $x, $H;
		1785	$w = _scale $size, $w, $child->{req_w};
		1786	$h = _scale $size, $h, $child->{req_h};
		1787
		1788	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1789	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1790	}
		1791	}
		1792
		1793	my $W = $x2 - $x1;
		1794	my $H = $y2 - $y1;
		1795
		1796	($W, $H)
		1797	}
		1798
		1799	sub invoke_size_allocate {
		1800	my ($self, $W, $H) = @_;
		1801
		1802	for my $child ($self->visible_children) {
		1803	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1804
		1805	$x = _scale $pos, $x, $W;
		1806	$y = _scale $pos, $x, $H;
		1807	$w = _scale $size, $w, $child->{req_w};
		1808	$h = _scale $size, $h, $child->{req_h};
		1809
		1810	$child->configure ($x, $y, $w, $h);
		1811	}
		1812
		1813	1
		1814	}
		1815
		1816	#############################################################################
		1817
		1818	package CFPlus::UI::Box;
		1819
		1820	our @ISA = CFPlus::UI::Container::;
1428		1821
1429	sub size_request {	1822	sub size_request {
1430	my ($self) = @_;	1823	my ($self) = @_;
1431		1824
1432	$self->{vertical}	1825	$self->{vertical}
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1858	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1859	for 0 .. $#children;
1467	}	1860	}
1468	}	1861	}
1469		1862
1470	CFClient::UI::harmonize \@req;	1863	CFPlus::UI::harmonize \@req;
1471		1864
1472	my $pos = 0;	1865	my $pos = 0;
1473	for (0 .. $#children) {	1866	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1867	my $alloc = $req[$_];
1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1868	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1480	1	1873	1
1481	}	1874	}
1482		1875
1483	#############################################################################	1876	#############################################################################
1484		1877
1485	package CFClient::UI::HBox;	1878	package CFPlus::UI::HBox;
1486		1879
1487	our @ISA = CFClient::UI::Box::;	1880	our @ISA = CFPlus::UI::Box::;
1488		1881
1489	sub new {	1882	sub new {
1490	my $class = shift;	1883	my $class = shift;
1491		1884
1492	$class->SUPER::new (	1885	$class->SUPER::new (
…		…
1495	)	1888	)
1496	}	1889	}
1497		1890
1498	#############################################################################	1891	#############################################################################
1499		1892
1500	package CFClient::UI::VBox;	1893	package CFPlus::UI::VBox;
1501		1894
1502	our @ISA = CFClient::UI::Box::;	1895	our @ISA = CFPlus::UI::Box::;
1503		1896
1504	sub new {	1897	sub new {
1505	my $class = shift;	1898	my $class = shift;
1506		1899
1507	$class->SUPER::new (	1900	$class->SUPER::new (
…		…
1510	)	1903	)
1511	}	1904	}
1512		1905
1513	#############################################################################	1906	#############################################################################
1514		1907
1515	package CFClient::UI::Label;	1908	package CFPlus::UI::Label;
1516		1909
1517	our @ISA = CFClient::UI::DrawBG::;	1910	our @ISA = CFPlus::UI::DrawBG::;
1518		1911
1519	use CFClient::OpenGL;	1912	use CFPlus::OpenGL;
1520		1913
1521	sub new {	1914	sub new {
1522	my ($class, %arg) = @_;	1915	my ($class, %arg) = @_;
1523		1916
1524	my $self = $class->SUPER::new (	1917	my $self = $class->SUPER::new (
…		…
1527	#active_bg => none	1920	#active_bg => none
1528	#font => default_font	1921	#font => default_font
1529	#text => initial text	1922	#text => initial text
1530	#markup => initial narkup	1923	#markup => initial narkup
1531	#max_w => maximum pixel width	1924	#max_w => maximum pixel width
		1925	#style => 0, # render flags
1532	ellipsise => 3, # end	1926	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1927	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1928	fontsize => 1,
1535	align => -1,	1929	align => -1,
1536	valign => -1,	1930	valign => -1,
1537	padding_x => 2,	1931	padding_x => 2,
1538	padding_y => 2,	1932	padding_y => 2,
1539	can_events => 0,	1933	can_events => 0,
1540	%arg	1934	%arg
1541	);	1935	);
1542		1936
1543	if (exists $self->{template}) {	1937	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1938	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1939	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1940	$self->{template} = $layout;
1547	}	1941	}
1548		1942
1549	if (exists $self->{markup}) {	1943	if (exists $self->{markup}) {
…		…
1553	}	1947	}
1554		1948
1555	$self	1949	$self
1556	}	1950	}
1557		1951
1558	sub escape($) {
1559	local $_ = $_[0];
1560
1561	s/&/&amp;/g;
1562	s/>/&gt;/g;
1563	s/</&lt;/g;
1564
1565	$_
1566	}
1567
1568	sub update {	1952	sub update {
1569	my ($self) = @_;	1953	my ($self) = @_;
1570		1954
1571	delete $self->{texture};	1955	delete $self->{texture};
1572	$self->SUPER::update;	1956	$self->SUPER::update;
…		…
1583	my ($self, $text) = @_;	1967	my ($self, $text) = @_;
1584		1968
1585	return if $self->{text} eq "T$text";	1969	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1970	$self->{text} = "T$text";
1587		1971
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	1972	$self->{layout}->set_text ($text);
1590		1973
1591	delete $self->{size_req};	1974	delete $self->{size_req};
1592	$self->realloc;	1975	$self->realloc;
1593	$self->update;	1976	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	1982	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	1983	$self->{text} = "M$markup";
1601		1984
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1985	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		1986
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	1987	$self->{layout}->set_markup ($markup);
1606		1988
1607	delete $self->{size_req};	1989	delete $self->{size_req};
1608	$self->realloc;	1990	$self->realloc;
1609	$self->update;	1991	$self->update;
…		…
1621		2003
1622	my ($w, $h) = $self->{layout}->size;	2004	my ($w, $h) = $self->{layout}->size;
1623		2005
1624	if (exists $self->{template}) {	2006	if (exists $self->{template}) {
1625	$self->{template}->set_font ($self->{font}) if $self->{font};	2007	$self->{template}->set_font ($self->{font}) if $self->{font};
		2008	$self->{template}->set_width ($self->{max_w} || -1);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2009	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		2010
1628	my ($w2, $h2) = $self->{template}->size;	2011	my ($w2, $h2) = $self->{template}->size;
1629		2012
1630	$w = List::Util::max $w, $w2;	2013	$w = List::Util::max $w, $w2;
…		…
1664		2047
1665	sub reconfigure {	2048	sub reconfigure {
1666	my ($self) = @_;	2049	my ($self) = @_;
1667		2050
1668	delete $self->{size_req};	2051	delete $self->{size_req};
		2052	delete $self->{texture};
1669		2053
1670	$self->SUPER::reconfigure;	2054	$self->SUPER::reconfigure;
1671	}	2055	}
1672		2056
1673	sub _draw {	2057	sub _draw {
1674	my ($self) = @_;	2058	my ($self) = @_;
1675		2059
1676	$self->SUPER::_draw; # draw background, if applicable	2060	$self->SUPER::_draw; # draw background, if applicable
1677		2061
1678	my $tex = $self->{texture} ||= do {	2062	my $size = $self->{texture} ||= do {
1679	$self->{layout}->set_foreground (@{$self->{fg}});	2063	$self->{layout}->set_foreground (@{$self->{fg}});
1680	$self->{layout}->set_font ($self->{font}) if $self->{font};	2064	$self->{layout}->set_font ($self->{font}) if $self->{font};
1681	$self->{layout}->set_width ($self->{w});	2065	$self->{layout}->set_width ($self->{w});
1682	$self->{layout}->set_ellipsise ($self->{ellipsise});	2066	$self->{layout}->set_ellipsise ($self->{ellipsise});
1683	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2067	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1684	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2068	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1685		2069
1686	new_from_layout CFClient::Texture $self->{layout}	2070	[$self->{layout}->size]
1687	};	2071	};
1688		2072
1689	unless (exists $self->{ox}) {	2073	unless (exists $self->{ox}) {
1690	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2074	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1691	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2075	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1692	: ($self->{w} - $tex->{w}) * 0.5);	2076	: ($self->{w} - $size->[0]) * 0.5);
1693		2077
1694	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2078	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1695	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2079	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1696	: ($self->{h} - $tex->{h}) * 0.5);	2080	: ($self->{h} - $size->[1]) * 0.5);
1697	};	2081	};
1698		2082
1699	glEnable GL_TEXTURE_2D;
1700
1701	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2083	my $w = List::Util::min $self->{w} + 4, $size->[0];
1702	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2084	my $h = List::Util::min $self->{h} + 2, $size->[1];
1703		2085
1704	if ($tex->{format} == GL_ALPHA) {	2086	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1705	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1706	glColor @{$self->{fg}};
1707	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1708	} else {
1709	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1710	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1711	}
1712
1713	glDisable GL_TEXTURE_2D;
1714	}	2087	}
1715		2088
1716	#############################################################################	2089	#############################################################################
1717		2090
1718	package CFClient::UI::EntryBase;	2091	package CFPlus::UI::EntryBase;
1719		2092
1720	our @ISA = CFClient::UI::Label::;	2093	our @ISA = CFPlus::UI::Label::;
1721		2094
1722	use CFClient::OpenGL;	2095	use CFPlus::OpenGL;
1723		2096
1724	sub new {	2097	sub new {
1725	my $class = shift;	2098	my $class = shift;
1726		2099
1727	$class->SUPER::new (	2100	$class->SUPER::new (
…		…
1731	active_fg => [0, 0, 0],	2104	active_fg => [0, 0, 0],
1732	can_hover => 1,	2105	can_hover => 1,
1733	can_focus => 1,	2106	can_focus => 1,
1734	valign => 0,	2107	valign => 0,
1735	can_events => 1,	2108	can_events => 1,
		2109	ellipsise => 0,
1736	#text => ...	2110	#text => ...
1737	#hidden => "*",	2111	#hidden => "*",
1738	@_	2112	@_
1739	)	2113	)
1740	}	2114	}
…		…
1785	my $sym = $ev->{sym};	2159	my $sym = $ev->{sym};
1786	my $uni = $ev->{unicode};	2160	my $uni = $ev->{unicode};
1787		2161
1788	my $text = $self->get_text;	2162	my $text = $self->get_text;
1789		2163
		2164	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2165
1790	if ($uni == 8) {	2166	if ($uni == 8) {
1791	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2167	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1792	} elsif ($uni == 127) {	2168	} elsif ($uni == 127) {
1793	substr $text, $self->{cursor}, 1, "";	2169	substr $text, $self->{cursor}, 1, "";
1794	} elsif ($sym == CFClient::SDLK_LEFT) {	2170	} elsif ($sym == CFPlus::SDLK_LEFT) {
1795	--$self->{cursor} if $self->{cursor};	2171	--$self->{cursor} if $self->{cursor};
1796	} elsif ($sym == CFClient::SDLK_RIGHT) {	2172	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1797	++$self->{cursor} if $self->{cursor} < length $self->{text};	2173	++$self->{cursor} if $self->{cursor} < length $self->{text};
1798	} elsif ($sym == CFClient::SDLK_HOME) {	2174	} elsif ($sym == CFPlus::SDLK_HOME) {
		2175	# what a hack
		2176	$self->{cursor} =
		2177	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2178	? length $1
		2179	: 0;
		2180	} elsif ($sym == CFPlus::SDLK_END) {
		2181	# uh, again
		2182	$self->{cursor} =
		2183	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2184	? $self->{cursor} + length $1
		2185	: length $self->{text};
		2186	} elsif ($uni == 21) { # ctrl-u
		2187	$text = "";
1799	$self->{cursor} = 0;	2188	$self->{cursor} = 0;
1800	} elsif ($sym == CFClient::SDLK_END) {
1801	$self->{cursor} = length $text;
1802	} elsif ($uni == 27) {	2189	} elsif ($uni == 27) {
1803	$self->emit ('escape');	2190	$self->emit ('escape');
1804	} elsif ($uni) {	2191	} elsif ($uni == 0x0d) {
		2192	substr $text, $self->{cursor}++, 0, "\012";
		2193	} elsif ($uni >= 0x20) {
1805	substr $text, $self->{cursor}++, 0, chr $uni;	2194	substr $text, $self->{cursor}++, 0, chr $uni;
1806	} else {	2195	} else {
1807	return 0;	2196	return 0;
1808	}	2197	}
1809		2198
1810	$self->_set_text ($text);	2199	$self->_set_text ($text);
1811		2200
1812	$self->realloc;	2201	$self->realloc;
		2202	$self->update;
1813		2203
1814	1	2204	1
1815	}	2205	}
1816		2206
1817	sub invoke_focus_in {	2207	sub invoke_focus_in {
…		…
1829		2219
1830	my $idx = $self->{layout}->xy_to_index ($x, $y);	2220	my $idx = $self->{layout}->xy_to_index ($x, $y);
1831		2221
1832	# byte-index to char-index	2222	# byte-index to char-index
1833	my $text = $self->{text};	2223	my $text = $self->{text};
1834	utf8::encode $text;	2224	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1835	$self->{cursor} = length substr $text, 0, $idx;	2225	$self->{cursor} = length $text;
1836		2226
1837	$self->_set_text ($self->{text});	2227	$self->_set_text ($self->{text});
1838	$self->update;	2228	$self->update;
1839		2229
1840	1	2230	1
…		…
1879	utf8::encode $text;	2269	utf8::encode $text;
1880		2270
1881	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2271	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1882	}	2272	}
1883		2273
1884	glColor @{$self->{fg}};
1885	glBegin GL_LINES;	2274	glBegin GL_LINES;
1886	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2275	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1887	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2276	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1888	glEnd;	2277	glEnd;
1889	}	2278	}
1890	}	2279	}
1891		2280
		2281	#############################################################################
		2282
1892	package CFClient::UI::Entry;	2283	package CFPlus::UI::Entry;
1893		2284
1894	our @ISA = CFClient::UI::EntryBase::;	2285	our @ISA = CFPlus::UI::EntryBase::;
1895		2286
1896	use CFClient::OpenGL;	2287	use CFPlus::OpenGL;
1897		2288
1898	sub invoke_key_down {	2289	sub invoke_key_down {
1899	my ($self, $ev) = @_;	2290	my ($self, $ev) = @_;
1900		2291
1901	my $sym = $ev->{sym};	2292	my $sym = $ev->{sym};
1902		2293
1903	if ($sym == 13) {	2294	if ($ev->{uni} == 0x0d || $sym == 13) {
1904	unshift @{$self->{history}},	2295	unshift @{$self->{history}},
1905	my $txt = $self->get_text;	2296	my $txt = $self->get_text;
1906		2297
1907	$self->{history_pointer} = -1;	2298	$self->{history_pointer} = -1;
1908	$self->{history_saveback} = '';	2299	$self->{history_saveback} = '';
1909	$self->emit (activate => $txt);	2300	$self->emit (activate => $txt);
1910	$self->update;	2301	$self->update;
1911		2302
1912	} elsif ($sym == CFClient::SDLK_UP) {	2303	} elsif ($sym == CFPlus::SDLK_UP) {
1913	if ($self->{history_pointer} < 0) {	2304	if ($self->{history_pointer} < 0) {
1914	$self->{history_saveback} = $self->get_text;	2305	$self->{history_saveback} = $self->get_text;
1915	}	2306	}
1916	if (@{$self->{history} || []} > 0) {	2307	if (@{$self->{history} || []} > 0) {
1917	$self->{history_pointer}++;	2308	$self->{history_pointer}++;
…		…
1919	$self->{history_pointer} = @{$self->{history} || []} - 1;	2310	$self->{history_pointer} = @{$self->{history} || []} - 1;
1920	}	2311	}
1921	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2312	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1922	}	2313	}
1923		2314
1924	} elsif ($sym == CFClient::SDLK_DOWN) {	2315	} elsif ($sym == CFPlus::SDLK_DOWN) {
1925	$self->{history_pointer}--;	2316	$self->{history_pointer}--;
1926	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2317	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1927		2318
1928	if ($self->{history_pointer} >= 0) {	2319	if ($self->{history_pointer} >= 0) {
1929	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2320	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1938	1	2329	1
1939	}	2330	}
1940		2331
1941	#############################################################################	2332	#############################################################################
1942		2333
		2334	package CFPlus::UI::TextEdit;
		2335
		2336	our @ISA = CFPlus::UI::EntryBase::;
		2337
		2338	use CFPlus::OpenGL;
		2339
		2340	sub move_cursor_ver {
		2341	my ($self, $dy) = @_;
		2342
		2343	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2344
		2345	$y += $dy;
		2346
		2347	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2348	$self->{cursor} = $index;
		2349	delete $self->{cur_h};
		2350	$self->update;
		2351	return;
		2352	}
		2353	}
		2354
		2355	sub invoke_key_down {
		2356	my ($self, $ev) = @_;
		2357
		2358	my $sym = $ev->{sym};
		2359
		2360	if ($sym == CFPlus::SDLK_UP) {
		2361	$self->move_cursor_ver (-1);
		2362	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2363	$self->move_cursor_ver (+1);
		2364	} else {
		2365	return $self->SUPER::invoke_key_down ($ev)
		2366	}
		2367
		2368	1
		2369	}
		2370
		2371	#############################################################################
		2372
1943	package CFClient::UI::Button;	2373	package CFPlus::UI::Button;
1944		2374
1945	our @ISA = CFClient::UI::Label::;	2375	our @ISA = CFPlus::UI::Label::;
1946		2376
1947	use CFClient::OpenGL;	2377	use CFPlus::OpenGL;
1948		2378
1949	my @tex =	2379	my @tex =
1950	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2380	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1951	qw(b1_button_active.png);	2381	qw(b1_button_active.png);
1952		2382
1953	sub new {	2383	sub new {
1954	my $class = shift;	2384	my $class = shift;
1955		2385
…		…
1992	$self->SUPER::_draw;	2422	$self->SUPER::_draw;
1993	}	2423	}
1994		2424
1995	#############################################################################	2425	#############################################################################
1996		2426
		2427	package CFPlus::UI::CheckBox;
		2428
		2429	our @ISA = CFPlus::UI::DrawBG::;
		2430
		2431	my @tex =
		2432	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2433	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2434
		2435	use CFPlus::OpenGL;
		2436
		2437	sub new {
		2438	my $class = shift;
		2439
		2440	$class->SUPER::new (
		2441	padding_x => 2,
		2442	padding_y => 2,
		2443	fg => [1, 1, 1],
		2444	active_fg => [1, 1, 0],
		2445	bg => [0, 0, 0, 0.2],
		2446	active_bg => [1, 1, 1, 0.5],
		2447	state => 0,
		2448	can_hover => 1,
		2449	@_
		2450	)
		2451	}
		2452
		2453	sub size_request {
		2454	my ($self) = @_;
		2455
		2456	(6) x 2
		2457	}
		2458
		2459	sub toggle {
		2460	my ($self) = @_;
		2461
		2462	$self->{state} = !$self->{state};
		2463	$self->emit (changed => $self->{state});
		2464	$self->update;
		2465	}
		2466
		2467	sub invoke_button_down {
		2468	my ($self, $ev, $x, $y) = @_;
		2469
		2470	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2471	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2472	$self->toggle;
		2473	} else {
		2474	return 0
		2475	}
		2476
		2477	1
		2478	}
		2479
		2480	sub _draw {
		2481	my ($self) = @_;
		2482
		2483	$self->SUPER::_draw;
		2484
		2485	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2486
		2487	my ($w, $h) = @$self{qw(w h)};
		2488
		2489	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2490
		2491	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2492
		2493	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2494
		2495	glEnable GL_TEXTURE_2D;
		2496	$tex->draw_quad_alpha (0, 0, $s, $s);
		2497	glDisable GL_TEXTURE_2D;
		2498	}
		2499
		2500	#############################################################################
		2501
		2502	package CFPlus::UI::Image;
		2503
		2504	our @ISA = CFPlus::UI::Base::;
		2505
		2506	use CFPlus::OpenGL;
		2507
		2508	our %texture_cache;
		2509
		2510	sub new {
		2511	my $class = shift;
		2512
		2513	my $self = $class->SUPER::new (
		2514	can_events => 0,
		2515	@_,
		2516	);
		2517
		2518	$self->{path} || $self->{tex}
		2519	or Carp::croak "'path' or 'tex' attributes required";
		2520
		2521	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2522	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2523
		2524	CFPlus::weaken $texture_cache{$self->{path}};
		2525
		2526	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2527
		2528	$self
		2529	}
		2530
		2531	sub STORABLE_freeze {
		2532	my ($self, $cloning) = @_;
		2533
		2534	$self->{path}
		2535	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2536
		2537	$self->{path}
		2538	}
		2539
		2540	sub STORABLE_attach {
		2541	my ($self, $cloning, $path) = @_;
		2542
		2543	$self->new (path => $path)
		2544	}
		2545
		2546	sub size_request {
		2547	my ($self) = @_;
		2548
		2549	($self->{tex}{w}, $self->{tex}{h})
		2550	}
		2551
		2552	sub _draw {
		2553	my ($self) = @_;
		2554
		2555	my $tex = $self->{tex};
		2556
		2557	my ($w, $h) = ($self->{w}, $self->{h});
		2558
		2559	if ($self->{rot90}) {
		2560	glRotate 90, 0, 0, 1;
		2561	glTranslate 0, -$self->{w}, 0;
		2562
		2563	($w, $h) = ($h, $w);
		2564	}
		2565
		2566	glEnable GL_TEXTURE_2D;
		2567	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2568
		2569	$tex->draw_quad (0, 0, $w, $h);
		2570
		2571	glDisable GL_TEXTURE_2D;
		2572	}
		2573
		2574	#############################################################################
		2575
1997	package CFClient::UI::ImageButton;	2576	package CFPlus::UI::ImageButton;
1998		2577
1999	our @ISA = CFClient::UI::Image::;	2578	our @ISA = CFPlus::UI::Image::;
2000		2579
2001	use CFClient::OpenGL;	2580	use CFPlus::OpenGL;
2002		2581
2003	my %textures;	2582	my %textures;
2004		2583
2005	sub new {	2584	sub new {
2006	my $class = shift;	2585	my $class = shift;
…		…
2028	1	2607	1
2029	}	2608	}
2030		2609
2031	#############################################################################	2610	#############################################################################
2032		2611
2033	package CFClient::UI::CheckBox;
2034
2035	our @ISA = CFClient::UI::DrawBG::;
2036
2037	my @tex =
2038	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2039	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2040
2041	use CFClient::OpenGL;
2042
2043	sub new {
2044	my $class = shift;
2045
2046	$class->SUPER::new (
2047	padding_x => 2,
2048	padding_y => 2,
2049	fg => [1, 1, 1],
2050	active_fg => [1, 1, 0],
2051	bg => [0, 0, 0, 0.2],
2052	active_bg => [1, 1, 1, 0.5],
2053	state => 0,
2054	can_hover => 1,
2055	@_
2056	)
2057	}
2058
2059	sub size_request {
2060	my ($self) = @_;
2061
2062	(6) x 2
2063	}
2064
2065	sub invoke_button_down {
2066	my ($self, $ev, $x, $y) = @_;
2067
2068	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2069	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2070	$self->{state} = !$self->{state};
2071	$self->emit (changed => $self->{state});
2072	} else {
2073	return 0
2074	}
2075
2076	1
2077	}
2078
2079	sub _draw {
2080	my ($self) = @_;
2081
2082	$self->SUPER::_draw;
2083
2084	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2085
2086	my ($w, $h) = @$self{qw(w h)};
2087
2088	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2089
2090	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2091
2092	my $tex = $self->{state} ? $tex[1] : $tex[0];
2093
2094	glEnable GL_TEXTURE_2D;
2095	$tex->draw_quad_alpha (0, 0, $s, $s);
2096	glDisable GL_TEXTURE_2D;
2097	}
2098
2099	#############################################################################
2100
2101	package CFClient::UI::Image;	2612	package CFPlus::UI::VGauge;
2102		2613
2103	our @ISA = CFClient::UI::Base::;	2614	our @ISA = CFPlus::UI::Base::;
2104
2105	use CFClient::OpenGL;
2106
2107	our %texture_cache;
2108
2109	sub new {
2110	my $class = shift;
2111
2112	my $self = $class->SUPER::new (
2113	can_events => 0,
2114	@_,
2115	);
2116
2117	$self->{path}
2118	or Carp::croak "required attribute 'path' not set";
2119
2120	$self->{tex} = $texture_cache{$self->{path}} ||=
2121	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2122
2123	Scalar::Util::weaken $texture_cache{$self->{path}};
2124
2125	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2126
2127	$self
2128	}
2129
2130	sub size_request {
2131	my ($self) = @_;
2132
2133	($self->{tex}{w}, $self->{tex}{h})
2134	}
2135
2136	sub _draw {
2137	my ($self) = @_;
2138
2139	my $tex = $self->{tex};
2140
2141	my ($w, $h) = ($self->{w}, $self->{h});
2142
2143	if ($self->{rot90}) {
2144	glRotate 90, 0, 0, 1;
2145	glTranslate 0, -$self->{w}, 0;
2146
2147	($w, $h) = ($h, $w);
2148	}
2149
2150	glEnable GL_TEXTURE_2D;
2151	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2152
2153	$tex->draw_quad_alpha (0, 0, $w, $h);
2154
2155	glDisable GL_TEXTURE_2D;
2156	}
2157
2158	#############################################################################
2159
2160	package CFClient::UI::VGauge;
2161
2162	our @ISA = CFClient::UI::Base::;
2163		2615
2164	use List::Util qw(min max);	2616	use List::Util qw(min max);
2165		2617
2166	use CFClient::OpenGL;	2618	use CFPlus::OpenGL;
2167		2619
2168	my %tex = (	2620	my %tex = (
2169	food => [	2621	food => [
2170	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2622	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2171	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2623	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2172	],	2624	],
2173	grace => [	2625	grace => [
2174	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2626	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2175	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2627	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2176	],	2628	],
2177	hp => [	2629	hp => [
2178	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2630	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2179	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2631	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2180	],	2632	],
2181	mana => [	2633	mana => [
2182	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2634	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2183	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2635	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2184	],	2636	],
2185	);	2637	);
2186		2638
2187	# eg. VGauge->new (gauge => 'food'), default gauge: food	2639	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2247	my $ycut1 = max 0, min 1, $ycut;	2699	my $ycut1 = max 0, min 1, $ycut;
2248	my $ycut2 = max 0, min 1, $ycut - 1;	2700	my $ycut2 = max 0, min 1, $ycut - 1;
2249		2701
2250	my $h1 = $self->{h} * (1 - $ycut1);	2702	my $h1 = $self->{h} * (1 - $ycut1);
2251	my $h2 = $self->{h} * (1 - $ycut2);	2703	my $h2 = $self->{h} * (1 - $ycut2);
		2704	my $h3 = $self->{h};
		2705
		2706	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2252		2707
2253	glEnable GL_BLEND;	2708	glEnable GL_BLEND;
2254	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2709	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2710	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2256	glEnable GL_TEXTURE_2D;	2711	glEnable GL_TEXTURE_2D;
…		…
2275		2730
2276	if ($t3) {	2731	if ($t3) {
2277	glBindTexture GL_TEXTURE_2D, $t3->{name};	2732	glBindTexture GL_TEXTURE_2D, $t3->{name};
2278	glBegin GL_QUADS;	2733	glBegin GL_QUADS;
2279	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2734	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2280	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2735	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2281	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2736	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2282	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2737	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2283	glEnd;	2738	glEnd;
2284	}	2739	}
2285		2740
2286	glDisable GL_BLEND;	2741	glDisable GL_BLEND;
2287	glDisable GL_TEXTURE_2D;	2742	glDisable GL_TEXTURE_2D;
2288	}	2743	}
2289		2744
2290	#############################################################################	2745	#############################################################################
2291		2746
2292	package CFClient::UI::Gauge;	2747	package CFPlus::UI::Gauge;
2293		2748
2294	our @ISA = CFClient::UI::VBox::;	2749	our @ISA = CFPlus::UI::VBox::;
2295		2750
2296	sub new {	2751	sub new {
2297	my ($class, %arg) = @_;	2752	my ($class, %arg) = @_;
2298		2753
2299	my $self = $class->SUPER::new (	2754	my $self = $class->SUPER::new (
…		…
2301	can_hover => 1,	2756	can_hover => 1,
2302	can_events => 1,	2757	can_events => 1,
2303	%arg,	2758	%arg,
2304	);	2759	);
2305		2760
2306	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2761	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2307	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2762	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2308	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2763	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2309		2764
2310	$self	2765	$self
2311	}	2766	}
2312		2767
2313	sub set_fontsize {	2768	sub set_fontsize {
…		…
2334	$self->{value}->set_text ($val);	2789	$self->{value}->set_text ($val);
2335	}	2790	}
2336		2791
2337	#############################################################################	2792	#############################################################################
2338		2793
2339	package CFClient::UI::Slider;	2794	package CFPlus::UI::Slider;
2340		2795
2341	use strict;	2796	use strict;
2342		2797
2343	use CFClient::OpenGL;	2798	use CFPlus::OpenGL;
2344		2799
2345	our @ISA = CFClient::UI::DrawBG::;	2800	our @ISA = CFPlus::UI::DrawBG::;
2346		2801
2347	my @tex =	2802	my @tex =
2348	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2803	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2349	qw(s1_slider.png s1_slider_bg.png);	2804	qw(s1_slider.png s1_slider_bg.png);
2350		2805
2351	sub new {	2806	sub new {
2352	my $class = shift;	2807	my $class = shift;
2353		2808
…		…
2442	}	2897	}
2443		2898
2444	1	2899	1
2445	}	2900	}
2446		2901
		2902	sub invoke_mouse_wheel {
		2903	my ($self, $ev) = @_;
		2904
		2905	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2906
		2907	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2908
		2909	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2910
		2911	! ! $delta
		2912	}
		2913
2447	sub update {	2914	sub update {
2448	my ($self) = @_;	2915	my ($self) = @_;
2449		2916
2450	delete $self->{knob_w};	2917	delete $self->{knob_w};
2451	$self->SUPER::update;	2918	$self->SUPER::update;
…		…
2498	glDisable GL_TEXTURE_2D;	2965	glDisable GL_TEXTURE_2D;
2499	}	2966	}
2500		2967
2501	#############################################################################	2968	#############################################################################
2502		2969
2503	package CFClient::UI::ValSlider;	2970	package CFPlus::UI::ValSlider;
2504		2971
2505	our @ISA = CFClient::UI::HBox::;	2972	our @ISA = CFPlus::UI::HBox::;
2506		2973
2507	sub new {	2974	sub new {
2508	my ($class, %arg) = @_;	2975	my ($class, %arg) = @_;
2509		2976
2510	my $range = delete $arg{range};	2977	my $range = delete $arg{range};
2511		2978
2512	my $self = $class->SUPER::new (	2979	my $self = $class->SUPER::new (
2513	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2980	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2514	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2981	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2515	to_value => sub { shift },	2982	to_value => sub { shift },
2516	from_value => sub { shift },	2983	from_value => sub { shift },
2517	%arg,	2984	%arg,
2518	);	2985	);
2519		2986
…		…
2539	sub set_range { shift->{slider}->set_range (@_) }	3006	sub set_range { shift->{slider}->set_range (@_) }
2540	sub set_value { shift->{slider}->set_value (@_) }	3007	sub set_value { shift->{slider}->set_value (@_) }
2541		3008
2542	#############################################################################	3009	#############################################################################
2543		3010
2544	package CFClient::UI::TextScroller;	3011	package CFPlus::UI::TextScroller;
2545		3012
2546	our @ISA = CFClient::UI::HBox::;	3013	our @ISA = CFPlus::UI::HBox::;
2547		3014
2548	use CFClient::OpenGL;	3015	use CFPlus::OpenGL;
2549		3016
2550	sub new {	3017	sub new {
2551	my $class = shift;	3018	my $class = shift;
2552		3019
2553	my $self = $class->SUPER::new (	3020	my $self = $class->SUPER::new (
2554	fontsize => 1,	3021	fontsize => 1,
2555	can_events => 0,	3022	can_events => 1,
2556	indent => 0,	3023	indent => 0,
2557	#font => default_font	3024	#font => default_font
2558	@_,	3025	@_,
2559		3026
2560	layout => (new CFClient::Layout 1),	3027	layout => (new CFPlus::Layout),
2561	par => [],	3028	par => [],
		3029	max_par => 0,
2562	height => 0,	3030	height => 0,
2563	children => [	3031	children => [
2564	(new CFClient::UI::Empty expand => 1),	3032	(new CFPlus::UI::Empty expand => 1),
2565	(new CFClient::UI::Slider vertical => 1),	3033	(new CFPlus::UI::Slider vertical => 1),
2566	],	3034	],
2567	);	3035	);
2568		3036
2569	$self->{children}[1]->connect (changed => sub { $self->update });	3037	$self->{children}[1]->connect (changed => sub { $self->update });
2570		3038
…		…
2600		3068
2601	$self->reflow;	3069	$self->reflow;
2602		3070
2603	local $self->{children} = [$empty, $slider];	3071	local $self->{children} = [$empty, $slider];
2604	$self->SUPER::invoke_size_allocate ($w, $h)	3072	$self->SUPER::invoke_size_allocate ($w, $h)
		3073	}
		3074
		3075	sub invoke_mouse_wheel {
		3076	my ($self, $ev) = @_;
		3077
		3078	return 0 unless $ev->{dy}; # only vertical movements
		3079
		3080	$self->{children}[1]->emit (mouse_wheel => $ev);
		3081
		3082	1
2605	}	3083	}
2606		3084
2607	sub get_layout {	3085	sub get_layout {
2608	my ($self, $para) = @_;	3086	my ($self, $para) = @_;
2609		3087
…		…
2637		3115
2638	# todo: base offset on lines or so, not on pixels	3116	# todo: base offset on lines or so, not on pixels
2639	$self->{children}[1]->set_value ($offset);	3117	$self->{children}[1]->set_value ($offset);
2640	}	3118	}
2641		3119
		3120	sub current_paragraph {
		3121	my ($self) = @_;
		3122
		3123	$self->{top_paragraph} - 1
		3124	}
		3125
		3126	sub scroll_to {
		3127	my ($self, $para) = @_;
		3128
		3129	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3130
		3131	$self->{scroll_to} = $para;
		3132	$self->update;
		3133	}
		3134
2642	sub clear {	3135	sub clear {
2643	my ($self) = @_;	3136	my ($self) = @_;
2644		3137
2645	my (undef, undef, @other) = @{ $self->{children} };	3138	my (undef, undef, @other) = @{ $self->{children} };
2646	$self->remove ($_) for @other;	3139	$self->remove ($_) for @other;
…		…
2649	$self->{height} = 0;	3142	$self->{height} = 0;
2650	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3143	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2651	}	3144	}
2652		3145
2653	sub add_paragraph {	3146	sub add_paragraph {
2654	my ($self, $color, $para, $indent) = @_;	3147	my $self = shift;
2655		3148
2656	my ($text, @w) = ref $para ? @$para : $para;	3149	for my $para (@_) {
2657
2658	$para = {	3150	$para = {
		3151	fg => [1, 1, 1, 1],
		3152	indent => 0,
		3153	markup => "",
		3154	widget => [],
		3155	ref $para ? %$para : (markup => $para),
2659	w => 1e10,	3156	w => 1e10,
2660	wrapped => 1,	3157	wrapped => 1,
2661	fg => $color,
2662	indent => $indent,
2663	markup => $text,
2664	widget => \@w,
2665	};	3158	};
2666		3159
2667	$self->add (@w) if @w;	3160	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2668	push @{$self->{par}}, $para;	3161	push @{$self->{par}}, $para;
		3162	}
		3163
		3164	if (my $max = $self->{max_par}) {
		3165	shift @{$self->{par}} while @{$self->{par}} > $max;
		3166	}
2669		3167
2670	$self->{need_reflow}++;	3168	$self->{need_reflow}++;
2671	$self->update;	3169	$self->update;
2672	}	3170	}
2673		3171
2674	sub scroll_to_bottom {	3172	sub scroll_to_bottom {
2675	my ($self) = @_;	3173	my ($self) = @_;
2676		3174
2677	$self->{scroll_to_bottom} = 1;	3175	$self->{scroll_to} = $#{$self->{par}};
2678	$self->update;	3176	$self->update;
2679	}	3177	}
2680		3178
		3179	sub force_uptodate {
		3180	my ($self) = @_;
		3181
		3182	if (delete $self->{need_reflow}) {
		3183	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3184
		3185	my $height = 0;
		3186
		3187	for my $para (@{$self->{par}}) {
		3188	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3189	my $layout = $self->get_layout ($para);
		3190	my ($w, $h) = $layout->size;
		3191
		3192	$para->{w} = $w + $para->{indent};
		3193	$para->{h} = $h;
		3194	$para->{wrapped} = $layout->has_wrapped;
		3195	}
		3196
		3197	$para->{y} = $height;
		3198	$height += $para->{h};
		3199	}
		3200
		3201	$self->{height} = $height;
		3202	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3203
		3204	delete $self->{texture};
		3205	}
		3206
		3207	if (my $paridx = delete $self->{scroll_to}) {
		3208	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3209	}
		3210	}
		3211
2681	sub update {	3212	sub update {
2682	my ($self) = @_;	3213	my ($self) = @_;
2683		3214
2684	$self->SUPER::update;	3215	$self->SUPER::update;
2685		3216
2686	return unless $self->{h} > 0;	3217	return unless $self->{h} > 0;
2687		3218
2688	delete $self->{texture};	3219	delete $self->{texture};
2689		3220
2690	$ROOT->on_post_alloc ($self => sub {	3221	$ROOT->on_post_alloc ($self => sub {
		3222	$self->force_uptodate;
		3223
2691	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3224	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2692		3225
2693	if (delete $self->{need_reflow}) {
2694	my $height = 0;
2695
2696	for my $para (@{$self->{par}}) {
2697	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2698	my $layout = $self->get_layout ($para);
2699	my ($w, $h) = $layout->size;
2700
2701	$para->{w} = $w + $para->{indent};
2702	$para->{h} = $h;
2703	$para->{wrapped} = $layout->has_wrapped;
2704	}
2705
2706	$height += $para->{h};
2707	}
2708
2709	$self->{height} = $height;
2710
2711	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2712
2713	delete $self->{texture};
2714	}
2715
2716	if (delete $self->{scroll_to_bottom}) {
2717	$self->{children}[1]->set_value (1e10);
2718	}
2719
2720	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3226	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2721	glClearColor 0, 0, 0, 0;	3227	glClearColor 0, 0, 0, 0;
2722	glClear GL_COLOR_BUFFER_BIT;	3228	glClear GL_COLOR_BUFFER_BIT;
2723		3229
		3230	package CFPlus::UI::Base;
		3231	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3232	(0, 0, $self->{w}, $self->{h});
		3233
		3234	my $top = int $self->{children}[1]{range}[0];
		3235
		3236	my $paridx = 0;
		3237	my $top_paragraph;
2724	my $top = int $self->{children}[1]{range}[0];	3238	my $top = int $self->{children}[1]{range}[0];
2725		3239
2726	my $y0 = $top;	3240	my $y0 = $top;
2727	my $y1 = $top + $H;	3241	my $y1 = $top + $H;
2728		3242
2729	my $y = 0;
2730
2731	glEnable GL_BLEND;
2732	#TODO# not correct in windows where rgba is forced off
2733	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2734
2735	for my $para (@{$self->{par}}) {	3243	for my $para (@{$self->{par}}) {
2736	my $h = $para->{h};	3244	my $h = $para->{h};
		3245	my $y = $para->{y};
2737		3246
2738	if ($y0 < $y + $h && $y < $y1) {	3247	if ($y0 < $y + $h && $y < $y1) {
2739
2740	my $layout = $self->get_layout ($para);	3248	my $layout = $self->get_layout ($para);
2741		3249
2742	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2743
2744	glRasterPos $para->{indent}, $y - $y0;	3250	$layout->render ($para->{indent}, $y - $y0);
2745	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746		3251
2747	if (my @w = @{ $para->{widget} }) {	3252	if (my @w = @{ $para->{widget} }) {
2748	my @s = $layout->get_shapes;	3253	my @s = $layout->get_shapes;
2749		3254
2750	glDisable GL_BLEND;
2751	for (@w) {	3255	for (@w) {
2752	my ($dx, $dy) = splice @s, 0, 2, ();	3256	my ($dx, $dy) = splice @s, 0, 2, ();
2753		3257
2754	$_->{x} = $dx + $para->{indent};	3258	$_->{x} = $dx + $para->{indent};
2755	$_->{y} = $dy + $y - $y0;	3259	$_->{y} = $dy + $y - $y0;
2756		3260
2757	$_->draw;	3261	$_->draw;
2758	}	3262	}
2759	glEnable GL_BLEND;
2760	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761	}	3263	}
2762	}	3264	}
2763		3265
2764	$y += $h;	3266	$paridx++;
		3267	$top_paragraph ||= $paridx if $y >= $top;
2765	}	3268	}
2766		3269
2767	glDisable GL_BLEND;	3270	$self->{top_paragraph} = $top_paragraph;
2768	};	3271	};
2769	});	3272	});
2770	}	3273	}
2771		3274
2772	sub reconfigure {	3275	sub reconfigure {
…		…
2790	$self->{children}[1]->draw;	3293	$self->{children}[1]->draw;
2791	}	3294	}
2792		3295
2793	#############################################################################	3296	#############################################################################
2794		3297
2795	package CFClient::UI::Animator;	3298	package CFPlus::UI::Animator;
2796		3299
2797	use CFClient::OpenGL;	3300	use CFPlus::OpenGL;
2798		3301
2799	our @ISA = CFClient::UI::Bin::;	3302	our @ISA = CFPlus::UI::Bin::;
2800		3303
2801	sub moveto {	3304	sub moveto {
2802	my ($self, $x, $y) = @_;	3305	my ($self, $x, $y) = @_;
2803		3306
2804	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3307	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2832	glPopMatrix;	3335	glPopMatrix;
2833	}	3336	}
2834		3337
2835	#############################################################################	3338	#############################################################################
2836		3339
2837	package CFClient::UI::Flopper;	3340	package CFPlus::UI::Flopper;
2838		3341
2839	our @ISA = CFClient::UI::Button::;	3342	our @ISA = CFPlus::UI::Button::;
2840		3343
2841	sub new {	3344	sub new {
2842	my $class = shift;	3345	my $class = shift;
2843		3346
2844	my $self = $class->SUPER::new (	3347	my $self = $class->SUPER::new (
…		…
2856	$self->{other}->toggle_visibility;	3359	$self->{other}->toggle_visibility;
2857	}	3360	}
2858		3361
2859	#############################################################################	3362	#############################################################################
2860		3363
2861	package CFClient::UI::Tooltip;	3364	package CFPlus::UI::Tooltip;
2862		3365
2863	our @ISA = CFClient::UI::Bin::;	3366	our @ISA = CFPlus::UI::Bin::;
2864		3367
2865	use CFClient::OpenGL;	3368	use CFPlus::OpenGL;
2866		3369
2867	sub new {	3370	sub new {
2868	my $class = shift;	3371	my $class = shift;
2869		3372
2870	$class->SUPER::new (	3373	$class->SUPER::new (
…		…
2873	)	3376	)
2874	}	3377	}
2875		3378
2876	sub set_tooltip_from {	3379	sub set_tooltip_from {
2877	my ($self, $widget) = @_;	3380	my ($self, $widget) = @_;
		3381
		3382	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3383	if $widget->{tooltip} =~ /^#(.*)$/;
2878		3384
2879	my $tooltip = $widget->{tooltip};	3385	my $tooltip = $widget->{tooltip};
2880		3386
2881	if ($ENV{CFPLUS_DEBUG} & 2) {	3387	if ($ENV{CFPLUS_DEBUG} & 2) {
2882	$tooltip .= "\n\n" . (ref $widget) . "\n"	3388	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2886	}	3392	}
2887		3393
2888	$tooltip =~ s/^\n+//;	3394	$tooltip =~ s/^\n+//;
2889	$tooltip =~ s/\n+$//;	3395	$tooltip =~ s/\n+$//;
2890		3396
2891	$self->add (new CFClient::UI::Label	3397	$self->add (new CFPlus::UI::Label
2892	markup => $tooltip,	3398	markup => $tooltip,
2893	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3399	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2894	fontsize => 0.8,	3400	fontsize => 0.8,
2895	fg => [0, 0, 0, 1],	3401	style => 1, # FLAG_INVERSE
2896	ellipsise => 0,	3402	ellipsise => 0,
2897	font => ($widget->{tooltip_font} || $::FONT_PROP),	3403	font => ($widget->{tooltip_font} || $::FONT_PROP),
2898	);	3404	);
2899	}	3405	}
2900		3406
…		…
2919		3425
2920	$self->{root}->on_post_alloc ("move_$self" => sub {	3426	$self->{root}->on_post_alloc ("move_$self" => sub {
2921	my $widget = $self->{owner}	3427	my $widget = $self->{owner}
2922	or return;	3428	or return;
2923		3429
		3430	if ($widget->{visible}) {
2924	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3431	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2925		3432
2926	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3433	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2927	if $x + $self->{w} > $self->{root}{w};	3434	if $x + $self->{w} > $self->{root}{w};
2928		3435
2929	$self->move_abs ($x, $y);	3436	$self->move_abs ($x, $y);
		3437	} else {
		3438	$self->hide;
		3439	}
2930	});	3440	});
2931	}	3441	}
2932		3442
2933	sub _draw {	3443	sub _draw {
2934	my ($self) = @_;	3444	my ($self) = @_;
…		…
2958	$self->SUPER::_draw;	3468	$self->SUPER::_draw;
2959	}	3469	}
2960		3470
2961	#############################################################################	3471	#############################################################################
2962		3472
2963	package CFClient::UI::Face;	3473	package CFPlus::UI::Face;
2964		3474
2965	our @ISA = CFClient::UI::Base::;	3475	our @ISA = CFPlus::UI::DrawBG::;
2966		3476
2967	use CFClient::OpenGL;	3477	use CFPlus::OpenGL;
2968		3478
2969	sub new {	3479	sub new {
2970	my $class = shift;	3480	my $class = shift;
2971		3481
2972	my $self = $class->SUPER::new (	3482	my $self = $class->SUPER::new (
		3483	size_w => 32,
		3484	size_h => 8,
2973	aspect => 1,	3485	aspect => 1,
2974	can_events => 0,	3486	can_events => 0,
2975	@_,	3487	@_,
2976	);	3488	);
2977		3489
2978	if ($self->{anim} && $self->{animspeed}) {	3490	if ($self->{anim} && $self->{animspeed}) {
2979	Scalar::Util::weaken (my $widget = $self);	3491	CFPlus::weaken (my $widget = $self);
2980		3492
2981	$self->{timer} = Event->timer (	3493	$self->{timer} = Event->timer (
2982	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3494	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2983	hard => 1,	3495	hard => 1,
2984	interval => $self->{animspeed},	3496	interval => $self->{animspeed},
2985	cb => sub {	3497	cb => sub {
		3498	return unless $::CONN;
		3499
2986	++$widget->{frame};	3500	++$widget->{frame};
		3501	$self->update_face;
2987	$widget->update;	3502	$self->update;
2988	},	3503	},
2989	);	3504	);
		3505
		3506	$self->update_face;
2990	}	3507	}
2991		3508
2992	$self	3509	$self
2993	}	3510	}
2994		3511
		3512	sub update_face {
		3513	my ($self) = @_;
		3514
		3515	return unless $::CONN;
		3516
		3517	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3518	if ($anim && @$anim) {
		3519	delete $self->{wait_face};
		3520	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3521	}
		3522	}
		3523	}
		3524
2995	sub size_request {	3525	sub size_request {
2996	(32, 8)	3526	my ($self) = @_;
		3527
		3528	if ($::CONN) {
		3529	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3530	if (my $tex = $::CONN->{texture}[$faceid]) {
		3531	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3532	} else {
		3533	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3534	$self->realloc;
		3535	});
		3536	}
		3537	}
		3538	}
		3539
		3540	($self->{size_w} || 8, $self->{size_h} || 8)
2997	}	3541	}
2998		3542
2999	sub update {	3543	sub update {
3000	my ($self) = @_;	3544	my ($self) = @_;
3001		3545
…		…
3007	sub _draw {	3551	sub _draw {
3008	my ($self) = @_;	3552	my ($self) = @_;
3009		3553
3010	return unless $::CONN;	3554	return unless $::CONN;
3011		3555
3012	my $face;	3556	$self->SUPER::_draw;
3013		3557
3014	if ($self->{frame}) {
3015	my $anim = $::CONN->{anim}[$self->{anim}];	3558	my $faceid = $::CONN->{faceid}[$self->{face}]
3016		3559	or return;
3017	$face = $anim->[ $self->{frame} % @$anim ]
3018	if $anim && @$anim;
3019	}
3020		3560
3021	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3561	my $tex = $::CONN->{texture}[$faceid];
3022		3562
3023	if ($tex) {	3563	if ($tex) {
3024	glEnable GL_TEXTURE_2D;	3564	glEnable GL_TEXTURE_2D;
3025	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3565	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3026	glColor 0, 0, 0, 1;	3566	glColor 0, 0, 0, 1;
…		…
3038	$self->SUPER::destroy;	3578	$self->SUPER::destroy;
3039	}	3579	}
3040		3580
3041	#############################################################################	3581	#############################################################################
3042		3582
3043	package CFClient::UI::Buttonbar;	3583	package CFPlus::UI::Buttonbar;
3044		3584
3045	our @ISA = CFClient::UI::HBox::;	3585	our @ISA = CFPlus::UI::HBox::;
3046		3586
3047	# TODO: should actualyl wrap buttons and other goodies.	3587	# TODO: should actually wrap buttons and other goodies.
3048		3588
3049	#############################################################################	3589	#############################################################################
3050		3590
3051	package CFClient::UI::Menu;	3591	package CFPlus::UI::Menu;
3052		3592
3053	our @ISA = CFClient::UI::FancyFrame::;	3593	our @ISA = CFPlus::UI::Toplevel::;
3054		3594
3055	use CFClient::OpenGL;	3595	use CFPlus::OpenGL;
3056		3596
3057	sub new {	3597	sub new {
3058	my $class = shift;	3598	my $class = shift;
3059		3599
3060	my $self = $class->SUPER::new (	3600	my $self = $class->SUPER::new (
3061	items => [],	3601	items => [],
3062	z => 100,	3602	z => 100,
3063	@_,	3603	@_,
3064	);	3604	);
3065		3605
3066	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3606	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3067		3607
3068	for my $item (@{ $self->{items} }) {	3608	for my $item (@{ $self->{items} }) {
3069	my ($widget, $cb, $tooltip) = @$item;	3609	my ($widget, $cb, $tooltip) = @$item;
3070		3610
3071	# handle various types of items, only text for now	3611	# handle various types of items, only text for now
3072	if (!ref $widget) {	3612	if (!ref $widget) {
		3613	if ($widget =~ /\t/) {
		3614	my ($left, $right) = split /\t/, $widget, 2;
		3615
3073	$widget = new CFClient::UI::Label	3616	$widget = new CFPlus::UI::HBox
3074	can_hover => 1,	3617	can_hover => 1,
3075	can_events => 1,	3618	can_events => 1,
		3619	tooltip => $tooltip,
		3620	children => [
		3621	(new CFPlus::UI::Label markup => $left, expand => 1),
		3622	(new CFPlus::UI::Label markup => $right, align => +1),
		3623	],
		3624	;
		3625
		3626	} else {
		3627	$widget = new CFPlus::UI::Label
		3628	can_hover => 1,
		3629	can_events => 1,
3076	markup => $widget,	3630	markup => $widget,
3077	tooltip => $tooltip	3631	tooltip => $tooltip;
		3632	}
3078	}	3633	}
3079		3634
3080	$self->{item}{$widget} = $item;	3635	$self->{item}{$widget} = $item;
3081		3636
3082	$self->{vbox}->add ($widget);	3637	$self->{vbox}->add ($widget);
…		…
3125	1	3680	1
3126	}	3681	}
3127		3682
3128	#############################################################################	3683	#############################################################################
3129		3684
3130	package CFClient::UI::Multiplexer;	3685	package CFPlus::UI::Multiplexer;
3131		3686
3132	our @ISA = CFClient::UI::Container::;	3687	our @ISA = CFPlus::UI::Container::;
3133		3688
3134	sub new {	3689	sub new {
3135	my $class = shift;	3690	my $class = shift;
3136		3691
3137	my $self = $class->SUPER::new (	3692	my $self = $class->SUPER::new (
…		…
3151		3706
3152	$self->{current} = $self->{children}[0]	3707	$self->{current} = $self->{children}[0]
3153	if @{ $self->{children} };	3708	if @{ $self->{children} };
3154	}	3709	}
3155		3710
		3711	sub get_current_page {
		3712	my ($self) = @_;
		3713
		3714	$self->{current}
		3715	}
		3716
3156	sub set_current_page {	3717	sub set_current_page {
3157	my ($self, $page_or_widget) = @_;	3718	my ($self, $page_or_widget) = @_;
3158		3719
3159	my $widget = ref $page_or_widget	3720	my $widget = ref $page_or_widget
3160	? $page_or_widget	3721	? $page_or_widget
…		…
3192	$self->{current}->draw;	3753	$self->{current}->draw;
3193	}	3754	}
3194		3755
3195	#############################################################################	3756	#############################################################################
3196		3757
3197	package CFClient::UI::Notebook;	3758	package CFPlus::UI::Notebook;
3198		3759
3199	our @ISA = CFClient::UI::VBox::;	3760	our @ISA = CFPlus::UI::VBox::;
3200		3761
3201	sub new {	3762	sub new {
3202	my $class = shift;	3763	my $class = shift;
3203		3764
3204	my $self = $class->SUPER::new (	3765	my $self = $class->SUPER::new (
3205	buttonbar => (new CFClient::UI::Buttonbar),	3766	buttonbar => (new CFPlus::UI::Buttonbar),
3206	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3767	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3207	# filter => # will be put between multiplexer and $self	3768	# filter => # will be put between multiplexer and $self
3208	@_,	3769	@_,
3209	);	3770	);
3210		3771
3211	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3772	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3215	}	3776	}
3216		3777
3217	sub add {	3778	sub add {
3218	my ($self, $title, $widget, $tooltip) = @_;	3779	my ($self, $title, $widget, $tooltip) = @_;
3219		3780
3220	Scalar::Util::weaken $self;	3781	CFPlus::weaken $self;
3221		3782
3222	$self->{buttonbar}->add (new CFClient::UI::Button	3783	$self->{buttonbar}->add (new CFPlus::UI::Button
3223	markup => $title,	3784	markup => $title,
3224	tooltip => $tooltip,	3785	tooltip => $tooltip,
3225	on_activate => sub { $self->set_current_page ($widget) },	3786	on_activate => sub { $self->set_current_page ($widget) },
3226	);	3787	);
3227		3788
3228	$self->{multiplexer}->add ($widget);	3789	$self->{multiplexer}->add ($widget);
3229	}	3790	}
3230		3791
		3792	sub get_current_page {
		3793	my ($self) = @_;
		3794
		3795	$self->{multiplexer}->get_current_page
		3796	}
		3797
3231	sub set_current_page {	3798	sub set_current_page {
3232	my ($self, $page) = @_;	3799	my ($self, $page) = @_;
3233		3800
3234	$self->{multiplexer}->set_current_page ($page);	3801	$self->{multiplexer}->set_current_page ($page);
3235	$self->emit (page_changed => $self->{multiplexer}{current});	3802	$self->emit (page_changed => $self->{multiplexer}{current});
3236	}	3803	}
3237		3804
3238	#############################################################################	3805	#############################################################################
3239		3806
3240	package CFClient::UI::Combobox;	3807	package CFPlus::UI::Selector;
3241		3808
3242	use utf8;	3809	use utf8;
3243		3810
3244	our @ISA = CFClient::UI::Button::;	3811	our @ISA = CFPlus::UI::Button::;
3245		3812
3246	sub new {	3813	sub new {
3247	my $class = shift;	3814	my $class = shift;
3248		3815
3249	my $self = $class->SUPER::new (	3816	my $self = $class->SUPER::new (
…		…
3266	my ($value, $title, $tooltip) = @$_;	3833	my ($value, $title, $tooltip) = @$_;
3267		3834
3268	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3835	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269	}	3836	}
3270		3837
3271	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3838	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272	}	3839	}
3273		3840
3274	sub _set_value {	3841	sub _set_value {
3275	my ($self, $value) = @_;	3842	my ($self, $value) = @_;
3276		3843
…		…
3291	$self->emit (changed => $value);	3858	$self->emit (changed => $value);
3292	}	3859	}
3293		3860
3294	#############################################################################	3861	#############################################################################
3295		3862
3296	package CFClient::UI::Statusbox;	3863	package CFPlus::UI::Statusbox;
3297		3864
3298	our @ISA = CFClient::UI::VBox::;	3865	our @ISA = CFPlus::UI::VBox::;
3299		3866
3300	sub new {	3867	sub new {
3301	my $class = shift;	3868	my $class = shift;
3302		3869
3303	my $self = $class->SUPER::new (	3870	my $self = $class->SUPER::new (
3304	fontsize => 0.8,	3871	fontsize => 0.8,
3305	@_,	3872	@_,
3306	);	3873	);
3307		3874
3308	Scalar::Util::weaken (my $this = $self);	3875	CFPlus::weaken (my $this = $self);
3309		3876
3310	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3877	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3311		3878
3312	$self	3879	$self
3313	}	3880	}
…		…
3315	sub reorder {	3882	sub reorder {
3316	my ($self) = @_;	3883	my ($self) = @_;
3317	my $NOW = Time::HiRes::time;	3884	my $NOW = Time::HiRes::time;
3318		3885
3319	# freeze display when hovering over any label	3886	# freeze display when hovering over any label
3320	return if $CFClient::UI::TOOLTIP->{owner}	3887	return if $CFPlus::UI::TOOLTIP->{owner}
3321	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3888	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3322	values %{ $self->{item} };	3889	values %{ $self->{item} };
3323		3890
3324	while (my ($k, $v) = each %{ $self->{item} }) {	3891	while (my ($k, $v) = each %{ $self->{item} }) {
3325	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3892	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3326	}	3893	}
…		…
3347	for ($short) {	3914	for ($short) {
3348	s/^\s+//;	3915	s/^\s+//;
3349	s/\s+/ /g;	3916	s/\s+/ /g;
3350	}	3917	}
3351		3918
3352	new CFClient::UI::Label	3919	new CFPlus::UI::Label
3353	markup => $short,	3920	markup => $short,
3354	tooltip => $item->{tooltip},	3921	tooltip => $item->{tooltip},
3355	tooltip_font => $::FONT_PROP,	3922	tooltip_font => $::FONT_PROP,
3356	tooltip_width => 0.67,	3923	tooltip_width => 0.67,
3357	fontsize => $item->{fontsize} || $self->{fontsize},	3924	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3436	$self->SUPER::destroy;	4003	$self->SUPER::destroy;
3437	}	4004	}
3438		4005
3439	#############################################################################	4006	#############################################################################
3440		4007
3441	package CFClient::UI::Inventory;
3442
3443	our @ISA = CFClient::UI::ScrolledWindow::;
3444
3445	sub new {
3446	my $class = shift;
3447
3448	my $self = $class->SUPER::new (
3449	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3450	@_,
3451	);
3452
3453	$self
3454	}
3455
3456	sub set_items {
3457	my ($self, $items) = @_;
3458
3459	$self->{child}->clear;
3460	return unless $items;
3461
3462	my @items = sort {
3463	($a->{type} <=> $b->{type})
3464	or ($a->{name} cmp $b->{name})
3465	} values %$items;
3466
3467	$self->{real_items} = \@items;
3468
3469	my $row = 0;
3470	for my $item (@items) {
3471	CFClient::Item::update_widgets $item;
3472
3473	$self->{child}->add (0, $row, $item->{face_widget});
3474	$self->{child}->add (1, $row, $item->{desc_widget});
3475	$self->{child}->add (2, $row, $item->{weight_widget});
3476
3477	$row++;
3478	}
3479	}
3480
3481	#############################################################################
3482
3483	package CFClient::UI::SpellList;
3484
3485	our @ISA = CFClient::UI::Table::;
3486
3487	sub new {
3488	my $class = shift;
3489
3490	my $self = $class->SUPER::new (
3491	binding => [],
3492	commands => [],
3493	@_,
3494	)
3495	}
3496
3497	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3498
3499	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3500	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3501	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3502	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3503	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3504	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3505	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3506	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3507	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3508	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3509
3510	sub rebuild_spell_list {
3511	my ($self) = @_;
3512
3513	$CFClient::UI::ROOT->on_refresh ($self => sub {
3514	$self->clear;
3515
3516	return unless $::CONN;
3517
3518	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3519	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3520	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3521	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3522	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3523
3524	my $row = 0;
3525
3526	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3527	my $spell = $self->{spell}{$_};
3528
3529	$row++;
3530
3531	my $spell_cb = sub {
3532	my ($widget, $ev) = @_;
3533
3534	if ($ev->{button} == 1) {
3535	$::CONN->user_send ("cast $spell->{name}");
3536	} elsif ($ev->{button} == 2) {
3537	$::CONN->user_send ("invoke $spell->{name}");
3538	} elsif ($ev->{button} == 3) {
3539	(new CFClient::UI::Menu
3540	items => [
3541	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3542	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3543	],
3544	)->popup ($ev);
3545	} else {
3546	return 0;
3547	}
3548
3549	1
3550	};
3551
3552	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3553
3554	#TODO: add path info to tooltip
3555	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3556
3557	$self->add (0, $row, new CFClient::UI::Face
3558	face => $spell->{face},
3559	can_hover => 1,
3560	can_events => 1,
3561	tooltip => $tooltip,
3562	on_button_down => $spell_cb,
3563	);
3564
3565	$self->add (1, $row, new CFClient::UI::Label
3566	expand => 1,
3567	text => $spell->{name},
3568	can_hover => 1,
3569	can_events => 1,
3570	tooltip => $tooltip,
3571	on_button_down => $spell_cb,
3572	);
3573
3574	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3575	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3576	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3577	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3578	}
3579	});
3580	}
3581
3582	sub add_spell {
3583	my ($self, $spell) = @_;
3584
3585	$self->{spell}->{$spell->{name}} = $spell;
3586	$self->rebuild_spell_list;
3587	}
3588
3589	sub remove_spell {
3590	my ($self, $spell) = @_;
3591
3592	delete $self->{spell}->{$spell->{name}};
3593	$self->rebuild_spell_list;
3594	}
3595
3596	sub clear_spells {
3597	my ($self) = @_;
3598
3599	$self->{spell} = {};
3600	$self->rebuild_spell_list;
3601	}
3602
3603	#############################################################################
3604
3605	package CFClient::UI::Root;	4008	package CFPlus::UI::Root;
3606		4009
3607	our @ISA = CFClient::UI::Container::;	4010	our @ISA = CFPlus::UI::Container::;
3608		4011
3609	use List::Util qw(min max);	4012	use List::Util qw(min max);
3610		4013
3611	use CFClient::OpenGL;	4014	use CFPlus::OpenGL;
3612		4015
3613	sub new {	4016	sub new {
3614	my $class = shift;	4017	my $class = shift;
3615		4018
3616	my $self = $class->SUPER::new (	4019	my $self = $class->SUPER::new (
3617	visible => 1,	4020	visible => 1,
3618	@_,	4021	@_,
3619	);	4022	);
3620		4023
3621	Scalar::Util::weaken ($self->{root} = $self);	4024	CFPlus::weaken ($self->{root} = $self);
3622		4025
3623	$self	4026	$self
3624	}	4027	}
3625		4028
3626	sub size_request {	4029	sub size_request {
…		…
3792	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4195	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3793		4196
3794	$w = 0 if $w < 0;	4197	$w = 0 if $w < 0;
3795	$h = 0 if $h < 0;	4198	$h = 0 if $h < 0;
3796		4199
		4200	$w = max $widget->{min_w}, $w;
		4201	$h = max $widget->{min_h}, $h;
		4202
		4203	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4204	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4205
		4206	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4207	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4208
3797	$w = int $w + 0.5;	4209	$w = int $w + 0.5;
3798	$h = int $h + 0.5;	4210	$h = int $h + 0.5;
3799		4211
3800	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4212	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3801	$widget->{old_w} = $widget->{w};	4213	$widget->{old_w} = $widget->{w};
…		…
3824	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4236	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3825	glMatrixMode GL_MODELVIEW;	4237	glMatrixMode GL_MODELVIEW;
3826	glLoadIdentity;	4238	glLoadIdentity;
3827		4239
3828	{	4240	{
3829	package CFClient::UI::Base;	4241	package CFPlus::UI::Base;
3830		4242
3831	($draw_x, $draw_y, $draw_w, $draw_h) =	4243	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3832	(0, 0, $self->{w}, $self->{h});	4244	(0, 0, $self->{w}, $self->{h});
3833	}
3834		4245
3835	$self->_draw;	4246	$self->_draw;
		4247	}
3836	}	4248	}
3837		4249
3838	#############################################################################	4250	#############################################################################
3839		4251
3840	package CFClient::UI;	4252	package CFPlus::UI;
3841		4253
3842	$ROOT = new CFClient::UI::Root;	4254	$ROOT = new CFPlus::UI::Root;
3843	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4255	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3844		4256
3845	1	4257	1
3846		4258

Diff Legend

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