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.312 by root, Fri Jun 23 23:54:30 2006 UTC vs.
Revision 1.375 by root, Mon Jul 16 20:12:19 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
916	$self->update;	994	$self->update;
917	}	995	}
918		996
919	# hmm, this does not work for topleft of $self... but we should not ask for that	997	# hmm, this does not work for topleft of $self... but we should not ask for that
…		…
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1016	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1017	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1018	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1019	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	1020	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1021	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1022	}
945	}	1023	}
946		1024
947	sub _render {	1025	sub _render {
948	my ($self) = @_;	1026	my ($self) = @_;
949		1027
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1028	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};	1029	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1030
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1031	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1032
955	$self->SUPER::_render;	1033	$self->SUPER::_render;
956	}	1034	}
957		1035
958	#############################################################################	1036	#############################################################################
959		1037
960	package CFClient::UI::ScrolledWindow;	1038	package CFPlus::UI::ScrolledWindow;
961		1039
962	our @ISA = CFClient::UI::HBox::;	1040	our @ISA = CFPlus::UI::Table::;
963		1041
964	sub new {	1042	sub new {
965	my ($class, %arg) = @_;	1043	my ($class, %arg) = @_;
966		1044
967	my $child = delete $arg{child};	1045	my $child = delete $arg{child};
968		1046
969	my $self;	1047	my $self;
970		1048
971	my $slider = new CFClient::UI::Slider	1049	my $hslider = new CFPlus::UI::Slider
		1050	vertical => 0,
		1051	range => [0, 0, 1, 0.01], # HACK fix
		1052	on_changed => sub {
		1053	$self->{hpos} = $_[1];
		1054	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1055	},
		1056	;
		1057
		1058	my $vslider = new CFPlus::UI::Slider
972	vertical => 1,	1059	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1060	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1061	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1062	$self->{vpos} = $_[1];
		1063	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976	},	1064	},
977	;	1065	;
978		1066
979	$self = $class->SUPER::new (	1067	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1068	scroll_x => 0,
		1069	scroll_y => 1,
		1070	can_events => 1,
981	slider => $slider,	1071	hslider => $hslider,
		1072	vslider => $vslider,
		1073	col_expand => [1, 0],
		1074	row_expand => [1, 0],
982	%arg,	1075	%arg,
983	);	1076	);
984		1077
		1078	$self->{vp} = new CFPlus::UI::ViewPort
		1079	expand => 1,
		1080	scroll_x => $self->{scroll_x},
		1081	scroll_y => $self->{scroll_y},
		1082	;
		1083
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1084	$self->SUPER::add (0, 0, $self->{vp});
		1085
986	$self->add ($child) if $child;	1086	$self->add ($child) if $child;
987		1087
988	$self	1088	$self
989	}	1089	}
		1090
		1091	#TODO# update range on size_allocate depending on child
990		1092
991	sub add {	1093	sub add {
992	my ($self, $widget) = @_;	1094	my ($self, $widget) = @_;
993		1095
994	$self->{vp}->add ($self->{child} = $widget);	1096	$self->{vp}->add ($self->{child} = $widget);
995	}	1097	}
996		1098
		1099	sub update_slider {
		1100	my ($self) = @_;
		1101
		1102	my $child = ($self->{vp} or return)->child;
		1103
		1104	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1105	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1106
		1107	my $visible = $w1 > $w2;
		1108	if ($visible != $self->{hslider}{visible}) {
		1109	$visible ? $self->SUPER::add (0, 1, $self->{hslider})
		1110	: $self->{hslider}->hide;
		1111	}
		1112
		1113	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1114	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1115
		1116	my $visible = $h1 > $h2;
		1117	if ($visible != $self->{vslider}{visible}) {
		1118	$visible ? $self->SUPER::add (1, 0, $self->{vslider})
		1119	: $self->{vslider}->hide;
		1120	}
		1121	}
		1122
997	sub update {	1123	sub update {
998	my ($self) = @_;	1124	my ($self) = @_;
999		1125
1000	$self->SUPER::update;	1126	$self->SUPER::update;
		1127	$self->update_slider;
		1128	}
1001		1129
1002	# todo: overwrite size_allocate of child	1130	sub invoke_mouse_wheel {
1003	my $child = $self->{vp}->child;	1131	my ($self, $ev) = @_;
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1132
		1133	return 0 unless $ev->{dy}; # only vertical movements for now
		1134
		1135	$self->{vslider}->emit (mouse_wheel => $ev);
		1136
		1137	1
		1138	}
		1139
		1140	sub invoke_button_down {
		1141	my ($self, $ev, $x, $y) = @_;
		1142
		1143	if ($ev->{button} == 2) {
		1144	$self->grab_focus;
		1145
		1146	$self->{motion} = sub {
		1147	my ($ev, $x, $y) = @_;
		1148
		1149	$self->{vp}->set_offset (
		1150	$self->{vp}{view_x} - $ev->{xrel},
		1151	$self->{vp}{view_y} - $ev->{yrel},
		1152	);
		1153	};
		1154
		1155	return 1;
		1156	}
		1157
		1158	0
		1159	}
		1160
		1161	sub invoke_button_up {
		1162	my ($self, $ev, $x, $y) = @_;
		1163
		1164	if (delete $self->{motion}) {
		1165	return 1;
		1166	}
		1167
		1168	0
		1169	}
		1170
		1171	sub invoke_mouse_motion {
		1172	my ($self, $ev, $x, $y) = @_;
		1173
		1174	if ($self->{motion}) {
		1175	$self->{motion}->($ev, $x, $y);
		1176	return 1;
		1177	}
		1178
		1179	0
1005	}	1180	}
1006		1181
1007	sub invoke_size_allocate {	1182	sub invoke_size_allocate {
1008	my ($self, $w, $h) = @_;	1183	my ($self, $w, $h) = @_;
1009		1184
1010	my $child = $self->{vp}->child;	1185	$self->update_slider;
1011	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013	$self->SUPER::invoke_size_allocate ($w, $h)	1186	$self->SUPER::invoke_size_allocate ($w, $h)
1014	}	1187	}
1015		1188
1016	#TODO# update range on size_allocate depending on child
1017	# update viewport offset on scroll
1018
1019	#############################################################################	1189	#############################################################################
1020		1190
1021	package CFClient::UI::Frame;	1191	package CFPlus::UI::Frame;
1022		1192
1023	our @ISA = CFClient::UI::Bin::;	1193	our @ISA = CFPlus::UI::Bin::;
1024		1194
1025	use CFClient::OpenGL;	1195	use CFPlus::OpenGL;
1026		1196
1027	sub new {	1197	sub new {
1028	my $class = shift;	1198	my $class = shift;
1029		1199
1030	$class->SUPER::new (	1200	$class->SUPER::new (
…		…
1056	$self->SUPER::_draw;	1226	$self->SUPER::_draw;
1057	}	1227	}
1058		1228
1059	#############################################################################	1229	#############################################################################
1060		1230
1061	package CFClient::UI::FancyFrame;	1231	package CFPlus::UI::FancyFrame;
1062		1232
1063	our @ISA = CFClient::UI::Bin::;	1233	our @ISA = CFPlus::UI::Bin::;
1064		1234
1065	use CFClient::OpenGL;	1235	use CFPlus::OpenGL;
		1236
		1237	sub new {
		1238	my ($class, %arg) = @_;
		1239
		1240	if ((exists $arg{label}) && !ref $arg{label}) {
		1241	$arg{label} = new CFPlus::UI::Label
		1242	align => 1,
		1243	valign => 0,
		1244	text => $arg{label},
		1245	fontsize => ($arg{border} || 0.8) * 0.75;
		1246	}
		1247
		1248	my $self = $class->SUPER::new (
		1249	# label => "",
		1250	fg => [0.6, 0.3, 0.1],
		1251	border => 0.8,
		1252	style => 'single',
		1253	%arg,
		1254	);
		1255
		1256	$self
		1257	}
		1258
		1259	sub add {
		1260	my ($self, @widgets) = @_;
		1261
		1262	$self->SUPER::add (@widgets);
		1263	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1264	}
		1265
		1266	sub border {
		1267	int $_[0]{border} * $::FONTSIZE
		1268	}
		1269
		1270	sub size_request {
		1271	my ($self) = @_;
		1272
		1273	($self->{label_w}, undef) = $self->{label}->size_request
		1274	if $self->{label};
		1275
		1276	my ($w, $h) = $self->SUPER::size_request;
		1277
		1278	(
		1279	$w + $self->border * 2,
		1280	$h + $self->border * 2,
		1281	)
		1282	}
		1283
		1284	sub invoke_size_allocate {
		1285	my ($self, $w, $h) = @_;
		1286
		1287	my $border = $self->border;
		1288
		1289	$w -= List::Util::max 0, $border * 2;
		1290	$h -= List::Util::max 0, $border * 2;
		1291
		1292	if (my $label = $self->{label}) {
		1293	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1294	$label->{h} = List::Util::min $h, $border;
		1295	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1296	}
		1297
		1298	$self->child->configure ($border, $border, $w, $h);
		1299
		1300	1
		1301	}
		1302
		1303	sub _draw {
		1304	my ($self) = @_;
		1305
		1306	my $child = $self->{children}[0];
		1307
		1308	my $border = $self->border;
		1309	my ($w, $h) = ($self->{w}, $self->{h});
		1310
		1311	$child->draw;
		1312
		1313	glColor @{$self->{fg}};
		1314	glBegin GL_LINE_STRIP;
		1315	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1316	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1317	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1318	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1319	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1320	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1321	glEnd;
		1322
		1323	if ($self->{label}) {
		1324	glTranslate $border * 2, 0;
		1325	$self->{label}->_draw;
		1326	}
		1327	}
		1328
		1329	#############################################################################
		1330
		1331	package CFPlus::UI::Toplevel;
		1332
		1333	our @ISA = CFPlus::UI::Bin::;
		1334
		1335	use CFPlus::OpenGL;
1066		1336
1067	my $bg =	1337	my $bg =
1068	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1338	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069	mipmap => 1, wrap => 1;	1339	mipmap => 1, wrap => 1;
1070		1340
1071	my @border =	1341	my @border =
1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1342	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1343	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074		1344
1075	sub new {	1345	sub new {
1076	my ($class, %arg) = @_;	1346	my ($class, %arg) = @_;
1077		1347
1078	my $self = $class->SUPER::new (	1348	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1349	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1350	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1351	border => 0.6,
1082	can_events => 1,	1352	can_events => 1,
1083	min_w => 16,	1353	min_w => 64,
1084	min_h => 16,	1354	min_h => 32,
1085	%arg,	1355	%arg,
1086	);	1356	);
1087		1357
1088	$self->{title_widget} = new CFClient::UI::Label	1358	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1359	align => 0,
1090	valign => 1,	1360	valign => 1,
1091	text => $self->{title},	1361	text => $self->{title},
1092	fontsize => $self->{border},	1362	fontsize => $self->{border},
1093	if exists $self->{title};	1363	if exists $self->{title};
1094		1364
1095	if ($self->{has_close_button}) {	1365	if ($self->{has_close_button}) {
1096	$self->{close_button} =	1366	$self->{close_button} =
1097	new CFClient::UI::ImageButton	1367	new CFPlus::UI::ImageButton
1098	path => 'x1_close.png',	1368	path => 'x1_close.png',
1099	on_activate => sub { $self->hide };	1369	on_activate => sub { $self->emit ("delete") };
1100		1370
1101	$self->CFClient::UI::Container::add ($self->{close_button});	1371	$self->CFPlus::UI::Container::add ($self->{close_button});
1102	}	1372	}
1103		1373
1104	$self	1374	$self
1105	}	1375	}
1106		1376
1107	sub add {	1377	sub add {
1108	my ($self, @widgets) = @_;	1378	my ($self, @widgets) = @_;
1109		1379
1110	$self->SUPER::add (@widgets);	1380	$self->SUPER::add (@widgets);
1111	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1381	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1382	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113	}	1383	}
1114		1384
1115	sub border {	1385	sub border {
1116	int $_[0]{border} * $::FONTSIZE	1386	int $_[0]{border} * $::FONTSIZE
1117	}	1387	}
…		…
1150	$self->child->configure ($border, $border, $w, $h);	1420	$self->child->configure ($border, $border, $w, $h);
1151		1421
1152	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1422	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153	if $self->{close_button};	1423	if $self->{close_button};
1154		1424
		1425	1
		1426	}
		1427
		1428	sub invoke_delete {
		1429	my ($self) = @_;
		1430
		1431	$self->hide;
		1432
1155	1	1433	1
1156	}	1434	}
1157		1435
1158	sub invoke_button_down {	1436	sub invoke_button_down {
1159	my ($self, $ev, $x, $y) = @_;	1437	my ($self, $ev, $x, $y) = @_;
…		…
1217	$self->{motion}->($ev, $x, $y) if $self->{motion};	1495	$self->{motion}->($ev, $x, $y) if $self->{motion};
1218		1496
1219	! ! $self->{motion}	1497	! ! $self->{motion}
1220	}	1498	}
1221		1499
		1500	sub invoke_visibility_change {
		1501	my ($self, $visible) = @_;
		1502
		1503	delete $self->{motion} unless $visible;
		1504
		1505	0
		1506	}
		1507
1222	sub _draw {	1508	sub _draw {
1223	my ($self) = @_;	1509	my ($self) = @_;
1224		1510
1225	my $child = $self->{children}[0];	1511	my $child = $self->{children}[0];
1226		1512
…		…
1263	if $self->{close_button};	1549	if $self->{close_button};
1264	}	1550	}
1265		1551
1266	#############################################################################	1552	#############################################################################
1267		1553
1268	package CFClient::UI::Table;	1554	package CFPlus::UI::Table;
1269		1555
1270	our @ISA = CFClient::UI::Base::;	1556	our @ISA = CFPlus::UI::Base::;
1271		1557
1272	use List::Util qw(max sum);	1558	use List::Util qw(max sum);
1273		1559
1274	use CFClient::OpenGL;	1560	use CFPlus::OpenGL;
1275		1561
1276	sub new {	1562	sub new {
1277	my $class = shift;	1563	my $class = shift;
1278		1564
1279	$class->SUPER::new (	1565	$class->SUPER::new (
		1566	children => [],
1280	col_expand => [],	1567	col_expand => [],
		1568	row_expand => [],
1281	@_,	1569	@_,
1282	)	1570	)
1283	}	1571	}
1284		1572
1285	sub children {	1573	sub children {
1286	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1574	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287	}	1575	}
1288		1576
		1577	# TODO: store row/col info in child widget and use standard add/del
1289	sub add {	1578	sub add {
1290	my ($self, $x, $y, $child) = @_;	1579	my ($self) = shift;
1291		1580
		1581	while (@_) {
		1582	my ($x, $y, $child) = splice @_, 0, 3, ();
1292	$child->set_parent ($self);	1583	$child->set_parent ($self);
1293	$self->{children}[$y][$x] = $child;	1584	$self->{children}[$y][$x] = $child;
		1585	}
1294		1586
		1587	$self->{force_realloc} = 1;
		1588	$self->{force_size_alloc} = 1;
1295	$self->realloc;	1589	$self->realloc;
1296	}	1590	}
1297		1591
1298	sub remove {	1592	sub remove {
1299	my ($self, $child) = @_;	1593	my ($self, $child) = @_;
1300		1594
1301	# TODO: not yet implemented	1595	for (@{ $self->{children} }) {
		1596	for (@{ $_ || [] }) {
		1597	$_ = undef if $_ == $child;
		1598	}
		1599	}
1302	}	1600	}
1303		1601
1304	# TODO: move to container class maybe? send children a signal on removal?	1602	# TODO: move to container class maybe? send children a signal on removal?
1305	sub clear {	1603	sub clear {
1306	my ($self) = @_;	1604	my ($self) = @_;
…		…
1355	my ($ws, $hs) = $self->get_wh;	1653	my ($ws, $hs) = $self->get_wh;
1356		1654
1357	my $req_w = (sum @$ws) || 1;	1655	my $req_w = (sum @$ws) || 1;
1358	my $req_h = (sum @$hs) || 1;	1656	my $req_h = (sum @$hs) || 1;
1359		1657
1360	# TODO: nicer code && do row_expand	1658	# TODO: nicer code
1361	my @col_expand = @{$self->{col_expand}};	1659	my @col_expand = @{$self->{col_expand}};
1362	@col_expand = (1) x @$ws unless @col_expand;	1660	@col_expand = (1) x @$ws unless @col_expand;
1363	my $col_expand = (sum @col_expand) || 1;	1661	my $col_expand = (sum @col_expand) || 1;
1364		1662
1365	# linearly scale sizes
1366	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1663	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368		1664
1369	CFClient::UI::harmonize $ws;	1665	CFPlus::UI::harmonize $ws;
		1666
		1667	my @row_expand = @{$self->{row_expand}};
		1668	@row_expand = (1) x @$ws unless @row_expand;
		1669	my $row_expand = (sum @row_expand) || 1;
		1670
		1671	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1672
1370	CFClient::UI::harmonize $hs;	1673	CFPlus::UI::harmonize $hs;
1371		1674
1372	my $y;	1675	my $y;
1373		1676
1374	for my $r (0 .. $#{$self->{children}}) {	1677	for my $r (0 .. $#{$self->{children}}) {
1375	my $row = $self->{children}[$r]	1678	my $row = $self->{children}[$r]
…		…
1418	}	1721	}
1419	}	1722	}
1420		1723
1421	#############################################################################	1724	#############################################################################
1422		1725
1423	package CFClient::UI::Box;	1726	package CFPlus::UI::Fixed;
1424		1727
		1728	use List::Util qw(min max);
		1729
1425	our @ISA = CFClient::UI::Container::;	1730	our @ISA = CFPlus::UI::Container::;
		1731
		1732	sub add {
		1733	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1734
		1735	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1736	$self->SUPER::add ($child);
		1737	}
		1738
		1739	sub _scale($$$) {
		1740	my ($mode, $val, $max) = @_;
		1741
		1742	$mode eq "abs" ? $val
		1743	: $mode eq "rel" ? $val * $max
		1744	: 0
		1745	}
		1746
		1747	sub size_request {
		1748	my ($self) = @_;
		1749
		1750	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1751
		1752	# determine overall size by querying abs widgets
		1753	for my $child ($self->visible_children) {
		1754	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1755
		1756	if ($pos eq "abs") {
		1757	$w = _scale $size, $w, $child->{req_w};
		1758	$h = _scale $size, $h, $child->{req_h};
		1759
		1760	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1761	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1762	}
		1763	}
		1764
		1765	my $W = $x2 - $x1;
		1766	my $H = $y2 - $y1;
		1767
		1768	# now layout remaining widgets
		1769	for my $child ($self->visible_children) {
		1770	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1771
		1772	if ($pos ne "abs") {
		1773	$x = _scale $pos, $x, $W;
		1774	$y = _scale $pos, $x, $H;
		1775	$w = _scale $size, $w, $child->{req_w};
		1776	$h = _scale $size, $h, $child->{req_h};
		1777
		1778	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1779	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1780	}
		1781	}
		1782
		1783	my $W = $x2 - $x1;
		1784	my $H = $y2 - $y1;
		1785
		1786	($W, $H)
		1787	}
		1788
		1789	sub invoke_size_allocate {
		1790	my ($self, $W, $H) = @_;
		1791
		1792	for my $child ($self->visible_children) {
		1793	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1794
		1795	$x = _scale $pos, $x, $W;
		1796	$y = _scale $pos, $x, $H;
		1797	$w = _scale $size, $w, $child->{req_w};
		1798	$h = _scale $size, $h, $child->{req_h};
		1799
		1800	$child->configure ($x, $y, $w, $h);
		1801	}
		1802
		1803	1
		1804	}
		1805
		1806	#############################################################################
		1807
		1808	package CFPlus::UI::Box;
		1809
		1810	our @ISA = CFPlus::UI::Container::;
1426		1811
1427	sub size_request {	1812	sub size_request {
1428	my ($self) = @_;	1813	my ($self) = @_;
1429		1814
1430	$self->{vertical}	1815	$self->{vertical}
…		…
1463	$req[$_] += $space * $children[$_]{expand}	1848	$req[$_] += $space * $children[$_]{expand}
1464	for 0 .. $#children;	1849	for 0 .. $#children;
1465	}	1850	}
1466	}	1851	}
1467		1852
1468	CFClient::UI::harmonize \@req;	1853	CFPlus::UI::harmonize \@req;
1469		1854
1470	my $pos = 0;	1855	my $pos = 0;
1471	for (0 .. $#children) {	1856	for (0 .. $#children) {
1472	my $alloc = $req[$_];	1857	my $alloc = $req[$_];
1473	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1858	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1478	1	1863	1
1479	}	1864	}
1480		1865
1481	#############################################################################	1866	#############################################################################
1482		1867
1483	package CFClient::UI::HBox;	1868	package CFPlus::UI::HBox;
1484		1869
1485	our @ISA = CFClient::UI::Box::;	1870	our @ISA = CFPlus::UI::Box::;
1486		1871
1487	sub new {	1872	sub new {
1488	my $class = shift;	1873	my $class = shift;
1489		1874
1490	$class->SUPER::new (	1875	$class->SUPER::new (
…		…
1493	)	1878	)
1494	}	1879	}
1495		1880
1496	#############################################################################	1881	#############################################################################
1497		1882
1498	package CFClient::UI::VBox;	1883	package CFPlus::UI::VBox;
1499		1884
1500	our @ISA = CFClient::UI::Box::;	1885	our @ISA = CFPlus::UI::Box::;
1501		1886
1502	sub new {	1887	sub new {
1503	my $class = shift;	1888	my $class = shift;
1504		1889
1505	$class->SUPER::new (	1890	$class->SUPER::new (
…		…
1508	)	1893	)
1509	}	1894	}
1510		1895
1511	#############################################################################	1896	#############################################################################
1512		1897
1513	package CFClient::UI::Label;	1898	package CFPlus::UI::Label;
1514		1899
1515	our @ISA = CFClient::UI::DrawBG::;	1900	our @ISA = CFPlus::UI::DrawBG::;
1516		1901
1517	use CFClient::OpenGL;	1902	use CFPlus::OpenGL;
1518		1903
1519	sub new {	1904	sub new {
1520	my ($class, %arg) = @_;	1905	my ($class, %arg) = @_;
1521		1906
1522	my $self = $class->SUPER::new (	1907	my $self = $class->SUPER::new (
…		…
1525	#active_bg => none	1910	#active_bg => none
1526	#font => default_font	1911	#font => default_font
1527	#text => initial text	1912	#text => initial text
1528	#markup => initial narkup	1913	#markup => initial narkup
1529	#max_w => maximum pixel width	1914	#max_w => maximum pixel width
		1915	#style => 0, # render flags
1530	ellipsise => 3, # end	1916	ellipsise => 3, # end
1531	layout => (new CFClient::Layout),	1917	layout => (new CFPlus::Layout),
1532	fontsize => 1,	1918	fontsize => 1,
1533	align => -1,	1919	align => -1,
1534	valign => -1,	1920	valign => -1,
1535	padding_x => 2,	1921	padding_x => 2,
1536	padding_y => 2,	1922	padding_y => 2,
1537	can_events => 0,	1923	can_events => 0,
1538	%arg	1924	%arg
1539	);	1925	);
1540		1926
1541	if (exists $self->{template}) {	1927	if (exists $self->{template}) {
1542	my $layout = new CFClient::Layout;	1928	my $layout = new CFPlus::Layout;
1543	$layout->set_text (delete $self->{template});	1929	$layout->set_text (delete $self->{template});
1544	$self->{template} = $layout;	1930	$self->{template} = $layout;
1545	}	1931	}
1546		1932
1547	if (exists $self->{markup}) {	1933	if (exists $self->{markup}) {
…		…
1551	}	1937	}
1552		1938
1553	$self	1939	$self
1554	}	1940	}
1555		1941
1556	sub escape($) {
1557	local $_ = $_[0];
1558
1559	s/&/&amp;/g;
1560	s/>/&gt;/g;
1561	s/</&lt;/g;
1562
1563	$_
1564	}
1565
1566	sub update {	1942	sub update {
1567	my ($self) = @_;	1943	my ($self) = @_;
1568		1944
1569	delete $self->{texture};	1945	delete $self->{texture};
1570	$self->SUPER::update;	1946	$self->SUPER::update;
…		…
1581	my ($self, $text) = @_;	1957	my ($self, $text) = @_;
1582		1958
1583	return if $self->{text} eq "T$text";	1959	return if $self->{text} eq "T$text";
1584	$self->{text} = "T$text";	1960	$self->{text} = "T$text";
1585		1961
1586	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587	$self->{layout}->set_text ($text);	1962	$self->{layout}->set_text ($text);
1588		1963
1589	delete $self->{size_req};	1964	delete $self->{size_req};
1590	$self->realloc;	1965	$self->realloc;
1591	$self->update;	1966	$self->update;
…		…
1597	return if $self->{text} eq "M$markup";	1972	return if $self->{text} eq "M$markup";
1598	$self->{text} = "M$markup";	1973	$self->{text} = "M$markup";
1599		1974
1600	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1975	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601		1976
1602	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603	$self->{layout}->set_markup ($markup);	1977	$self->{layout}->set_markup ($markup);
1604		1978
1605	delete $self->{size_req};	1979	delete $self->{size_req};
1606	$self->realloc;	1980	$self->realloc;
1607	$self->update;	1981	$self->update;
…		…
1619		1993
1620	my ($w, $h) = $self->{layout}->size;	1994	my ($w, $h) = $self->{layout}->size;
1621		1995
1622	if (exists $self->{template}) {	1996	if (exists $self->{template}) {
1623	$self->{template}->set_font ($self->{font}) if $self->{font};	1997	$self->{template}->set_font ($self->{font}) if $self->{font};
		1998	$self->{template}->set_width ($self->{max_w} || -1);
1624	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1999	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625		2000
1626	my ($w2, $h2) = $self->{template}->size;	2001	my ($w2, $h2) = $self->{template}->size;
1627		2002
1628	$w = List::Util::max $w, $w2;	2003	$w = List::Util::max $w, $w2;
…		…
1652		2027
1653	sub set_fontsize {	2028	sub set_fontsize {
1654	my ($self, $fontsize) = @_;	2029	my ($self, $fontsize) = @_;
1655		2030
1656	$self->{fontsize} = $fontsize;	2031	$self->{fontsize} = $fontsize;
		2032	delete $self->{size_req};
1657	delete $self->{texture};	2033	delete $self->{texture};
1658		2034
1659	$self->realloc;	2035	$self->realloc;
1660	}	2036	}
1661		2037
1662	sub reconfigure {	2038	sub reconfigure {
1663	my ($self) = @_;	2039	my ($self) = @_;
1664		2040
1665	delete $self->{size_req};	2041	delete $self->{size_req};
		2042	delete $self->{texture};
1666		2043
1667	$self->SUPER::reconfigure;	2044	$self->SUPER::reconfigure;
1668	}	2045	}
1669		2046
1670	sub _draw {	2047	sub _draw {
1671	my ($self) = @_;	2048	my ($self) = @_;
1672		2049
1673	$self->SUPER::_draw; # draw background, if applicable	2050	$self->SUPER::_draw; # draw background, if applicable
1674		2051
1675	my $tex = $self->{texture} ||= do {	2052	my $size = $self->{texture} ||= do {
1676	$self->{layout}->set_foreground (@{$self->{fg}});	2053	$self->{layout}->set_foreground (@{$self->{fg}});
1677	$self->{layout}->set_font ($self->{font}) if $self->{font};	2054	$self->{layout}->set_font ($self->{font}) if $self->{font};
1678	$self->{layout}->set_width ($self->{w});	2055	$self->{layout}->set_width ($self->{w});
1679	$self->{layout}->set_ellipsise ($self->{ellipsise});	2056	$self->{layout}->set_ellipsise ($self->{ellipsise});
1680	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2057	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2058	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682		2059
1683	new_from_layout CFClient::Texture $self->{layout}	2060	[$self->{layout}->size]
1684	};	2061	};
1685		2062
1686	unless (exists $self->{ox}) {	2063	unless (exists $self->{ox}) {
1687	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2064	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2065	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689	: ($self->{w} - $tex->{w}) * 0.5);	2066	: ($self->{w} - $size->[0]) * 0.5);
1690		2067
1691	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2068	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2069	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693	: ($self->{h} - $tex->{h}) * 0.5);	2070	: ($self->{h} - $size->[1]) * 0.5);
1694	};	2071	};
1695		2072
1696	glEnable GL_TEXTURE_2D;
1697
1698	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2073	my $w = List::Util::min $self->{w} + 4, $size->[0];
1699	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2074	my $h = List::Util::min $self->{h} + 2, $size->[1];
1700		2075
1701	if ($tex->{format} == GL_ALPHA) {	2076	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1702	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1703	glColor @{$self->{fg}};
1704	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1705	} else {
1706	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1707	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1708	}
1709
1710	glDisable GL_TEXTURE_2D;
1711	}	2077	}
1712		2078
1713	#############################################################################	2079	#############################################################################
1714		2080
1715	package CFClient::UI::EntryBase;	2081	package CFPlus::UI::EntryBase;
1716		2082
1717	our @ISA = CFClient::UI::Label::;	2083	our @ISA = CFPlus::UI::Label::;
1718		2084
1719	use CFClient::OpenGL;	2085	use CFPlus::OpenGL;
1720		2086
1721	sub new {	2087	sub new {
1722	my $class = shift;	2088	my $class = shift;
1723		2089
1724	$class->SUPER::new (	2090	$class->SUPER::new (
…		…
1728	active_fg => [0, 0, 0],	2094	active_fg => [0, 0, 0],
1729	can_hover => 1,	2095	can_hover => 1,
1730	can_focus => 1,	2096	can_focus => 1,
1731	valign => 0,	2097	valign => 0,
1732	can_events => 1,	2098	can_events => 1,
		2099	ellipsise => 0,
1733	#text => ...	2100	#text => ...
1734	#hidden => "*",	2101	#hidden => "*",
1735	@_	2102	@_
1736	)	2103	)
1737	}	2104	}
…		…
1782	my $sym = $ev->{sym};	2149	my $sym = $ev->{sym};
1783	my $uni = $ev->{unicode};	2150	my $uni = $ev->{unicode};
1784		2151
1785	my $text = $self->get_text;	2152	my $text = $self->get_text;
1786		2153
		2154	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2155
1787	if ($uni == 8) {	2156	if ($uni == 8) {
1788	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2157	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789	} elsif ($uni == 127) {	2158	} elsif ($uni == 127) {
1790	substr $text, $self->{cursor}, 1, "";	2159	substr $text, $self->{cursor}, 1, "";
1791	} elsif ($sym == CFClient::SDLK_LEFT) {	2160	} elsif ($sym == CFPlus::SDLK_LEFT) {
1792	--$self->{cursor} if $self->{cursor};	2161	--$self->{cursor} if $self->{cursor};
1793	} elsif ($sym == CFClient::SDLK_RIGHT) {	2162	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1794	++$self->{cursor} if $self->{cursor} < length $self->{text};	2163	++$self->{cursor} if $self->{cursor} < length $self->{text};
1795	} elsif ($sym == CFClient::SDLK_HOME) {	2164	} elsif ($sym == CFPlus::SDLK_HOME) {
		2165	# what a hack
		2166	$self->{cursor} =
		2167	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2168	? length $1
		2169	: 0;
		2170	} elsif ($sym == CFPlus::SDLK_END) {
		2171	# uh, again
		2172	$self->{cursor} =
		2173	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2174	? $self->{cursor} + length $1
		2175	: length $self->{text};
		2176	} elsif ($uni == 21) { # ctrl-u
		2177	$text = "";
1796	$self->{cursor} = 0;	2178	$self->{cursor} = 0;
1797	} elsif ($sym == CFClient::SDLK_END) {
1798	$self->{cursor} = length $text;
1799	} elsif ($uni == 27) {	2179	} elsif ($uni == 27) {
1800	$self->emit ('escape');	2180	$self->emit ('escape');
1801	} elsif ($uni) {	2181	} elsif ($uni == 0x0d) {
		2182	substr $text, $self->{cursor}++, 0, "\012";
		2183	} elsif ($uni >= 0x20) {
1802	substr $text, $self->{cursor}++, 0, chr $uni;	2184	substr $text, $self->{cursor}++, 0, chr $uni;
1803	} else {	2185	} else {
1804	return 0;	2186	return 0;
1805	}	2187	}
1806		2188
1807	$self->_set_text ($text);	2189	$self->_set_text ($text);
1808		2190
1809	$self->realloc;	2191	$self->realloc;
		2192	$self->update;
1810		2193
1811	1	2194	1
1812	}	2195	}
1813		2196
1814	sub invoke_focus_in {	2197	sub invoke_focus_in {
…		…
1826		2209
1827	my $idx = $self->{layout}->xy_to_index ($x, $y);	2210	my $idx = $self->{layout}->xy_to_index ($x, $y);
1828		2211
1829	# byte-index to char-index	2212	# byte-index to char-index
1830	my $text = $self->{text};	2213	my $text = $self->{text};
1831	utf8::encode $text;	2214	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832	$self->{cursor} = length substr $text, 0, $idx;	2215	$self->{cursor} = length $text;
1833		2216
1834	$self->_set_text ($self->{text});	2217	$self->_set_text ($self->{text});
1835	$self->update;	2218	$self->update;
1836		2219
1837	1	2220	1
…		…
1876	utf8::encode $text;	2259	utf8::encode $text;
1877		2260
1878	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2261	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879	}	2262	}
1880		2263
1881	glColor @{$self->{fg}};
1882	glBegin GL_LINES;	2264	glBegin GL_LINES;
1883	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2265	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1884	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2266	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885	glEnd;	2267	glEnd;
1886	}	2268	}
1887	}	2269	}
1888		2270
		2271	#############################################################################
		2272
1889	package CFClient::UI::Entry;	2273	package CFPlus::UI::Entry;
1890		2274
1891	our @ISA = CFClient::UI::EntryBase::;	2275	our @ISA = CFPlus::UI::EntryBase::;
1892		2276
1893	use CFClient::OpenGL;	2277	use CFPlus::OpenGL;
1894		2278
1895	sub invoke_key_down {	2279	sub invoke_key_down {
1896	my ($self, $ev) = @_;	2280	my ($self, $ev) = @_;
1897		2281
1898	my $sym = $ev->{sym};	2282	my $sym = $ev->{sym};
1899		2283
1900	if ($sym == 13) {	2284	if ($ev->{uni} == 0x0d || $sym == 13) {
1901	unshift @{$self->{history}},	2285	unshift @{$self->{history}},
1902	my $txt = $self->get_text;	2286	my $txt = $self->get_text;
1903		2287
1904	$self->{history_pointer} = -1;	2288	$self->{history_pointer} = -1;
1905	$self->{history_saveback} = '';	2289	$self->{history_saveback} = '';
1906	$self->emit (activate => $txt);	2290	$self->emit (activate => $txt);
1907	$self->update;	2291	$self->update;
1908		2292
1909	} elsif ($sym == CFClient::SDLK_UP) {	2293	} elsif ($sym == CFPlus::SDLK_UP) {
1910	if ($self->{history_pointer} < 0) {	2294	if ($self->{history_pointer} < 0) {
1911	$self->{history_saveback} = $self->get_text;	2295	$self->{history_saveback} = $self->get_text;
1912	}	2296	}
1913	if (@{$self->{history} || []} > 0) {	2297	if (@{$self->{history} || []} > 0) {
1914	$self->{history_pointer}++;	2298	$self->{history_pointer}++;
…		…
1916	$self->{history_pointer} = @{$self->{history} || []} - 1;	2300	$self->{history_pointer} = @{$self->{history} || []} - 1;
1917	}	2301	}
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2302	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1919	}	2303	}
1920		2304
1921	} elsif ($sym == CFClient::SDLK_DOWN) {	2305	} elsif ($sym == CFPlus::SDLK_DOWN) {
1922	$self->{history_pointer}--;	2306	$self->{history_pointer}--;
1923	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2307	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924		2308
1925	if ($self->{history_pointer} >= 0) {	2309	if ($self->{history_pointer} >= 0) {
1926	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2310	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1935	1	2319	1
1936	}	2320	}
1937		2321
1938	#############################################################################	2322	#############################################################################
1939		2323
		2324	package CFPlus::UI::TextEdit;
		2325
		2326	our @ISA = CFPlus::UI::EntryBase::;
		2327
		2328	use CFPlus::OpenGL;
		2329
		2330	sub move_cursor_ver {
		2331	my ($self, $dy) = @_;
		2332
		2333	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2334
		2335	$y += $dy;
		2336
		2337	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2338	$self->{cursor} = $index;
		2339	delete $self->{cur_h};
		2340	$self->update;
		2341	return;
		2342	}
		2343	}
		2344
		2345	sub invoke_key_down {
		2346	my ($self, $ev) = @_;
		2347
		2348	my $sym = $ev->{sym};
		2349
		2350	if ($sym == CFPlus::SDLK_UP) {
		2351	$self->move_cursor_ver (-1);
		2352	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2353	$self->move_cursor_ver (+1);
		2354	} else {
		2355	return $self->SUPER::invoke_key_down ($ev)
		2356	}
		2357
		2358	1
		2359	}
		2360
		2361	#############################################################################
		2362
1940	package CFClient::UI::Button;	2363	package CFPlus::UI::Button;
1941		2364
1942	our @ISA = CFClient::UI::Label::;	2365	our @ISA = CFPlus::UI::Label::;
1943		2366
1944	use CFClient::OpenGL;	2367	use CFPlus::OpenGL;
1945		2368
1946	my @tex =	2369	my @tex =
1947	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2370	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948	qw(b1_button_active.png);	2371	qw(b1_button_active.png);
1949		2372
1950	sub new {	2373	sub new {
1951	my $class = shift;	2374	my $class = shift;
1952		2375
…		…
1989	$self->SUPER::_draw;	2412	$self->SUPER::_draw;
1990	}	2413	}
1991		2414
1992	#############################################################################	2415	#############################################################################
1993		2416
		2417	package CFPlus::UI::CheckBox;
		2418
		2419	our @ISA = CFPlus::UI::DrawBG::;
		2420
		2421	my @tex =
		2422	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2423	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2424
		2425	use CFPlus::OpenGL;
		2426
		2427	sub new {
		2428	my $class = shift;
		2429
		2430	$class->SUPER::new (
		2431	padding_x => 2,
		2432	padding_y => 2,
		2433	fg => [1, 1, 1],
		2434	active_fg => [1, 1, 0],
		2435	bg => [0, 0, 0, 0.2],
		2436	active_bg => [1, 1, 1, 0.5],
		2437	state => 0,
		2438	can_hover => 1,
		2439	@_
		2440	)
		2441	}
		2442
		2443	sub size_request {
		2444	my ($self) = @_;
		2445
		2446	(6) x 2
		2447	}
		2448
		2449	sub toggle {
		2450	my ($self) = @_;
		2451
		2452	$self->{state} = !$self->{state};
		2453	$self->emit (changed => $self->{state});
		2454	$self->update;
		2455	}
		2456
		2457	sub invoke_button_down {
		2458	my ($self, $ev, $x, $y) = @_;
		2459
		2460	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2461	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2462	$self->toggle;
		2463	} else {
		2464	return 0
		2465	}
		2466
		2467	1
		2468	}
		2469
		2470	sub _draw {
		2471	my ($self) = @_;
		2472
		2473	$self->SUPER::_draw;
		2474
		2475	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2476
		2477	my ($w, $h) = @$self{qw(w h)};
		2478
		2479	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2480
		2481	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2482
		2483	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2484
		2485	glEnable GL_TEXTURE_2D;
		2486	$tex->draw_quad_alpha (0, 0, $s, $s);
		2487	glDisable GL_TEXTURE_2D;
		2488	}
		2489
		2490	#############################################################################
		2491
		2492	package CFPlus::UI::Image;
		2493
		2494	our @ISA = CFPlus::UI::Base::;
		2495
		2496	use CFPlus::OpenGL;
		2497
		2498	our %texture_cache;
		2499
		2500	sub new {
		2501	my $class = shift;
		2502
		2503	my $self = $class->SUPER::new (
		2504	can_events => 0,
		2505	@_,
		2506	);
		2507
		2508	$self->{path} || $self->{tex}
		2509	or Carp::croak "'path' or 'tex' attributes required";
		2510
		2511	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2512	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2513
		2514	CFPlus::weaken $texture_cache{$self->{path}};
		2515
		2516	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2517
		2518	$self
		2519	}
		2520
		2521	sub STORABLE_freeze {
		2522	my ($self, $cloning) = @_;
		2523
		2524	$self->{path}
		2525	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2526
		2527	$self->{path}
		2528	}
		2529
		2530	sub STORABLE_attach {
		2531	my ($self, $cloning, $path) = @_;
		2532
		2533	$self->new (path => $path)
		2534	}
		2535
		2536	sub size_request {
		2537	my ($self) = @_;
		2538
		2539	($self->{tex}{w}, $self->{tex}{h})
		2540	}
		2541
		2542	sub _draw {
		2543	my ($self) = @_;
		2544
		2545	my $tex = $self->{tex};
		2546
		2547	my ($w, $h) = ($self->{w}, $self->{h});
		2548
		2549	if ($self->{rot90}) {
		2550	glRotate 90, 0, 0, 1;
		2551	glTranslate 0, -$self->{w}, 0;
		2552
		2553	($w, $h) = ($h, $w);
		2554	}
		2555
		2556	glEnable GL_TEXTURE_2D;
		2557	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2558
		2559	$tex->draw_quad (0, 0, $w, $h);
		2560
		2561	glDisable GL_TEXTURE_2D;
		2562	}
		2563
		2564	#############################################################################
		2565
1994	package CFClient::UI::ImageButton;	2566	package CFPlus::UI::ImageButton;
1995		2567
1996	our @ISA = CFClient::UI::Image::;	2568	our @ISA = CFPlus::UI::Image::;
1997		2569
1998	use CFClient::OpenGL;	2570	use CFPlus::OpenGL;
1999		2571
2000	my %textures;	2572	my %textures;
2001		2573
2002	sub new {	2574	sub new {
2003	my $class = shift;	2575	my $class = shift;
…		…
2025	1	2597	1
2026	}	2598	}
2027		2599
2028	#############################################################################	2600	#############################################################################
2029		2601
2030	package CFClient::UI::CheckBox;
2031
2032	our @ISA = CFClient::UI::DrawBG::;
2033
2034	my @tex =
2035	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2036	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037
2038	use CFClient::OpenGL;
2039
2040	sub new {
2041	my $class = shift;
2042
2043	$class->SUPER::new (
2044	padding_x => 2,
2045	padding_y => 2,
2046	fg => [1, 1, 1],
2047	active_fg => [1, 1, 0],
2048	bg => [0, 0, 0, 0.2],
2049	active_bg => [1, 1, 1, 0.5],
2050	state => 0,
2051	can_hover => 1,
2052	@_
2053	)
2054	}
2055
2056	sub size_request {
2057	my ($self) = @_;
2058
2059	(6) x 2
2060	}
2061
2062	sub invoke_button_down {
2063	my ($self, $ev, $x, $y) = @_;
2064
2065	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2066	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2067	$self->{state} = !$self->{state};
2068	$self->emit (changed => $self->{state});
2069	} else {
2070	return 0
2071	}
2072
2073	1
2074	}
2075
2076	sub _draw {
2077	my ($self) = @_;
2078
2079	$self->SUPER::_draw;
2080
2081	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2082
2083	my ($w, $h) = @$self{qw(w h)};
2084
2085	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2086
2087	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2088
2089	my $tex = $self->{state} ? $tex[1] : $tex[0];
2090
2091	glEnable GL_TEXTURE_2D;
2092	$tex->draw_quad_alpha (0, 0, $s, $s);
2093	glDisable GL_TEXTURE_2D;
2094	}
2095
2096	#############################################################################
2097
2098	package CFClient::UI::Image;	2602	package CFPlus::UI::VGauge;
2099		2603
2100	our @ISA = CFClient::UI::Base::;	2604	our @ISA = CFPlus::UI::Base::;
2101
2102	use CFClient::OpenGL;
2103
2104	our %texture_cache;
2105
2106	sub new {
2107	my $class = shift;
2108
2109	my $self = $class->SUPER::new (
2110	can_events => 0,
2111	@_,
2112	);
2113
2114	$self->{path}
2115	or Carp::croak "required attribute 'path' not set";
2116
2117	$self->{tex} = $texture_cache{$self->{path}} ||=
2118	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2119
2120	Scalar::Util::weaken $texture_cache{$self->{path}};
2121
2122	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2123
2124	$self
2125	}
2126
2127	sub size_request {
2128	my ($self) = @_;
2129
2130	($self->{tex}{w}, $self->{tex}{h})
2131	}
2132
2133	sub _draw {
2134	my ($self) = @_;
2135
2136	my $tex = $self->{tex};
2137
2138	my ($w, $h) = ($self->{w}, $self->{h});
2139
2140	if ($self->{rot90}) {
2141	glRotate 90, 0, 0, 1;
2142	glTranslate 0, -$self->{w}, 0;
2143
2144	($w, $h) = ($h, $w);
2145	}
2146
2147	glEnable GL_TEXTURE_2D;
2148	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2149
2150	$tex->draw_quad_alpha (0, 0, $w, $h);
2151
2152	glDisable GL_TEXTURE_2D;
2153	}
2154
2155	#############################################################################
2156
2157	package CFClient::UI::VGauge;
2158
2159	our @ISA = CFClient::UI::Base::;
2160		2605
2161	use List::Util qw(min max);	2606	use List::Util qw(min max);
2162		2607
2163	use CFClient::OpenGL;	2608	use CFPlus::OpenGL;
2164		2609
2165	my %tex = (	2610	my %tex = (
2166	food => [	2611	food => [
2167	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2612	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2613	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169	],	2614	],
2170	grace => [	2615	grace => [
2171	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2616	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2617	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2173	],	2618	],
2174	hp => [	2619	hp => [
2175	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2620	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2621	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177	],	2622	],
2178	mana => [	2623	mana => [
2179	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2624	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2180	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2625	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2181	],	2626	],
2182	);	2627	);
2183		2628
2184	# eg. VGauge->new (gauge => 'food'), default gauge: food	2629	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2244	my $ycut1 = max 0, min 1, $ycut;	2689	my $ycut1 = max 0, min 1, $ycut;
2245	my $ycut2 = max 0, min 1, $ycut - 1;	2690	my $ycut2 = max 0, min 1, $ycut - 1;
2246		2691
2247	my $h1 = $self->{h} * (1 - $ycut1);	2692	my $h1 = $self->{h} * (1 - $ycut1);
2248	my $h2 = $self->{h} * (1 - $ycut2);	2693	my $h2 = $self->{h} * (1 - $ycut2);
		2694	my $h3 = $self->{h};
		2695
		2696	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249		2697
2250	glEnable GL_BLEND;	2698	glEnable GL_BLEND;
2251	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2699	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2700	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253	glEnable GL_TEXTURE_2D;	2701	glEnable GL_TEXTURE_2D;
…		…
2272		2720
2273	if ($t3) {	2721	if ($t3) {
2274	glBindTexture GL_TEXTURE_2D, $t3->{name};	2722	glBindTexture GL_TEXTURE_2D, $t3->{name};
2275	glBegin GL_QUADS;	2723	glBegin GL_QUADS;
2276	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2724	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2725	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2726	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2727	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280	glEnd;	2728	glEnd;
2281	}	2729	}
2282		2730
2283	glDisable GL_BLEND;	2731	glDisable GL_BLEND;
2284	glDisable GL_TEXTURE_2D;	2732	glDisable GL_TEXTURE_2D;
2285	}	2733	}
2286		2734
2287	#############################################################################	2735	#############################################################################
2288		2736
2289	package CFClient::UI::Gauge;	2737	package CFPlus::UI::Gauge;
2290		2738
2291	our @ISA = CFClient::UI::VBox::;	2739	our @ISA = CFPlus::UI::VBox::;
2292		2740
2293	sub new {	2741	sub new {
2294	my ($class, %arg) = @_;	2742	my ($class, %arg) = @_;
2295		2743
2296	my $self = $class->SUPER::new (	2744	my $self = $class->SUPER::new (
…		…
2298	can_hover => 1,	2746	can_hover => 1,
2299	can_events => 1,	2747	can_events => 1,
2300	%arg,	2748	%arg,
2301	);	2749	);
2302		2750
2303	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2751	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2304	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2752	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2305	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2753	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306		2754
2307	$self	2755	$self
2308	}	2756	}
2309		2757
2310	sub set_fontsize {	2758	sub set_fontsize {
…		…
2331	$self->{value}->set_text ($val);	2779	$self->{value}->set_text ($val);
2332	}	2780	}
2333		2781
2334	#############################################################################	2782	#############################################################################
2335		2783
2336	package CFClient::UI::Slider;	2784	package CFPlus::UI::Slider;
2337		2785
2338	use strict;	2786	use strict;
2339		2787
2340	use CFClient::OpenGL;	2788	use CFPlus::OpenGL;
2341		2789
2342	our @ISA = CFClient::UI::DrawBG::;	2790	our @ISA = CFPlus::UI::DrawBG::;
2343		2791
2344	my @tex =	2792	my @tex =
2345	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2793	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346	qw(s1_slider.png s1_slider_bg.png);	2794	qw(s1_slider.png s1_slider_bg.png);
2347		2795
2348	sub new {	2796	sub new {
2349	my $class = shift;	2797	my $class = shift;
2350		2798
…		…
2439	}	2887	}
2440		2888
2441	1	2889	1
2442	}	2890	}
2443		2891
		2892	sub invoke_mouse_wheel {
		2893	my ($self, $ev) = @_;
		2894
		2895	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2896
		2897	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2898
		2899	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2900
		2901	! ! $delta
		2902	}
		2903
2444	sub update {	2904	sub update {
2445	my ($self) = @_;	2905	my ($self) = @_;
2446		2906
2447	delete $self->{knob_w};	2907	delete $self->{knob_w};
2448	$self->SUPER::update;	2908	$self->SUPER::update;
…		…
2495	glDisable GL_TEXTURE_2D;	2955	glDisable GL_TEXTURE_2D;
2496	}	2956	}
2497		2957
2498	#############################################################################	2958	#############################################################################
2499		2959
2500	package CFClient::UI::ValSlider;	2960	package CFPlus::UI::ValSlider;
2501		2961
2502	our @ISA = CFClient::UI::HBox::;	2962	our @ISA = CFPlus::UI::HBox::;
2503		2963
2504	sub new {	2964	sub new {
2505	my ($class, %arg) = @_;	2965	my ($class, %arg) = @_;
2506		2966
2507	my $range = delete $arg{range};	2967	my $range = delete $arg{range};
2508		2968
2509	my $self = $class->SUPER::new (	2969	my $self = $class->SUPER::new (
2510	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2970	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2971	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512	to_value => sub { shift },	2972	to_value => sub { shift },
2513	from_value => sub { shift },	2973	from_value => sub { shift },
2514	%arg,	2974	%arg,
2515	);	2975	);
2516		2976
…		…
2536	sub set_range { shift->{slider}->set_range (@_) }	2996	sub set_range { shift->{slider}->set_range (@_) }
2537	sub set_value { shift->{slider}->set_value (@_) }	2997	sub set_value { shift->{slider}->set_value (@_) }
2538		2998
2539	#############################################################################	2999	#############################################################################
2540		3000
2541	package CFClient::UI::TextScroller;	3001	package CFPlus::UI::TextScroller;
2542		3002
2543	our @ISA = CFClient::UI::HBox::;	3003	our @ISA = CFPlus::UI::HBox::;
2544		3004
2545	use CFClient::OpenGL;	3005	use CFPlus::OpenGL;
2546		3006
2547	sub new {	3007	sub new {
2548	my $class = shift;	3008	my $class = shift;
2549		3009
2550	my $self = $class->SUPER::new (	3010	my $self = $class->SUPER::new (
2551	fontsize => 1,	3011	fontsize => 1,
2552	can_events => 0,	3012	can_events => 1,
2553	indent => 0,	3013	indent => 0,
2554	#font => default_font	3014	#font => default_font
2555	@_,	3015	@_,
2556		3016
2557	layout => (new CFClient::Layout 1),	3017	layout => (new CFPlus::Layout),
2558	par => [],	3018	par => [],
		3019	max_par => 0,
2559	height => 0,	3020	height => 0,
2560	children => [	3021	children => [
2561	(new CFClient::UI::Empty expand => 1),	3022	(new CFPlus::UI::Empty expand => 1),
2562	(new CFClient::UI::Slider vertical => 1),	3023	(new CFPlus::UI::Slider vertical => 1),
2563	],	3024	],
2564	);	3025	);
2565		3026
2566	$self->{children}[1]->connect (changed => sub { $self->update });	3027	$self->{children}[1]->connect (changed => sub { $self->update });
2567		3028
…		…
2597		3058
2598	$self->reflow;	3059	$self->reflow;
2599		3060
2600	local $self->{children} = [$empty, $slider];	3061	local $self->{children} = [$empty, $slider];
2601	$self->SUPER::invoke_size_allocate ($w, $h)	3062	$self->SUPER::invoke_size_allocate ($w, $h)
		3063	}
		3064
		3065	sub invoke_mouse_wheel {
		3066	my ($self, $ev) = @_;
		3067
		3068	return 0 unless $ev->{dy}; # only vertical movements
		3069
		3070	$self->{children}[1]->emit (mouse_wheel => $ev);
		3071
		3072	1
2602	}	3073	}
2603		3074
2604	sub get_layout {	3075	sub get_layout {
2605	my ($self, $para) = @_;	3076	my ($self, $para) = @_;
2606		3077
…		…
2634		3105
2635	# todo: base offset on lines or so, not on pixels	3106	# todo: base offset on lines or so, not on pixels
2636	$self->{children}[1]->set_value ($offset);	3107	$self->{children}[1]->set_value ($offset);
2637	}	3108	}
2638		3109
		3110	sub current_paragraph {
		3111	my ($self) = @_;
		3112
		3113	$self->{top_paragraph} - 1
		3114	}
		3115
		3116	sub scroll_to {
		3117	my ($self, $para) = @_;
		3118
		3119	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3120
		3121	$self->{scroll_to} = $para;
		3122	$self->update;
		3123	}
		3124
2639	sub clear {	3125	sub clear {
2640	my ($self) = @_;	3126	my ($self) = @_;
2641		3127
2642	my (undef, undef, @other) = @{ $self->{children} };	3128	my (undef, undef, @other) = @{ $self->{children} };
2643	$self->remove ($_) for @other;	3129	$self->remove ($_) for @other;
…		…
2646	$self->{height} = 0;	3132	$self->{height} = 0;
2647	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3133	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648	}	3134	}
2649		3135
2650	sub add_paragraph {	3136	sub add_paragraph {
2651	my ($self, $color, $para, $indent) = @_;	3137	my $self = shift;
2652		3138
2653	my ($text, @w) = ref $para ? @$para : $para;	3139	for my $para (@_) {
2654
2655	$para = {	3140	$para = {
		3141	fg => [1, 1, 1, 1],
		3142	indent => 0,
		3143	markup => "",
		3144	widget => [],
		3145	ref $para ? %$para : (markup => $para),
2656	w => 1e10,	3146	w => 1e10,
2657	wrapped => 1,	3147	wrapped => 1,
2658	fg => $color,
2659	indent => $indent,
2660	markup => $text,
2661	widget => \@w,
2662	};	3148	};
2663		3149
2664	$self->add (@w) if @w;	3150	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665	push @{$self->{par}}, $para;	3151	push @{$self->{par}}, $para;
		3152	}
		3153
		3154	if (my $max = $self->{max_par}) {
		3155	shift @{$self->{par}} while @{$self->{par}} > $max;
		3156	}
2666		3157
2667	$self->{need_reflow}++;	3158	$self->{need_reflow}++;
2668	$self->update;	3159	$self->update;
2669	}	3160	}
2670		3161
2671	sub scroll_to_bottom {	3162	sub scroll_to_bottom {
2672	my ($self) = @_;	3163	my ($self) = @_;
2673		3164
2674	$self->{scroll_to_bottom} = 1;	3165	$self->{scroll_to} = $#{$self->{par}};
2675	$self->update;	3166	$self->update;
2676	}	3167	}
2677		3168
		3169	sub force_uptodate {
		3170	my ($self) = @_;
		3171
		3172	if (delete $self->{need_reflow}) {
		3173	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3174
		3175	my $height = 0;
		3176
		3177	for my $para (@{$self->{par}}) {
		3178	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3179	my $layout = $self->get_layout ($para);
		3180	my ($w, $h) = $layout->size;
		3181
		3182	$para->{w} = $w + $para->{indent};
		3183	$para->{h} = $h;
		3184	$para->{wrapped} = $layout->has_wrapped;
		3185	}
		3186
		3187	$para->{y} = $height;
		3188	$height += $para->{h};
		3189	}
		3190
		3191	$self->{height} = $height;
		3192	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3193
		3194	delete $self->{texture};
		3195	}
		3196
		3197	if (my $paridx = delete $self->{scroll_to}) {
		3198	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3199	}
		3200	}
		3201
2678	sub update {	3202	sub update {
2679	my ($self) = @_;	3203	my ($self) = @_;
2680		3204
2681	$self->SUPER::update;	3205	$self->SUPER::update;
2682		3206
2683	return unless $self->{h} > 0;	3207	return unless $self->{h} > 0;
2684		3208
2685	delete $self->{texture};	3209	delete $self->{texture};
2686		3210
2687	$ROOT->on_post_alloc ($self => sub {	3211	$ROOT->on_post_alloc ($self => sub {
		3212	$self->force_uptodate;
		3213
2688	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3214	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689		3215
2690	if (delete $self->{need_reflow}) {
2691	my $height = 0;
2692
2693	for my $para (@{$self->{par}}) {
2694	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2695	my $layout = $self->get_layout ($para);
2696	my ($w, $h) = $layout->size;
2697
2698	$para->{w} = $w + $para->{indent};
2699	$para->{h} = $h;
2700	$para->{wrapped} = $layout->has_wrapped;
2701	}
2702
2703	$height += $para->{h};
2704	}
2705
2706	$self->{height} = $height;
2707
2708	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2709
2710	delete $self->{texture};
2711	}
2712
2713	if (delete $self->{scroll_to_bottom}) {
2714	$self->{children}[1]->set_value (1e10);
2715	}
2716
2717	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3216	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718	glClearColor 0, 0, 0, 0;	3217	glClearColor 0, 0, 0, 0;
2719	glClear GL_COLOR_BUFFER_BIT;	3218	glClear GL_COLOR_BUFFER_BIT;
2720		3219
		3220	package CFPlus::UI::Base;
		3221	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3222	(0, 0, $self->{w}, $self->{h});
		3223
		3224	my $top = int $self->{children}[1]{range}[0];
		3225
		3226	my $paridx = 0;
		3227	my $top_paragraph;
2721	my $top = int $self->{children}[1]{range}[0];	3228	my $top = int $self->{children}[1]{range}[0];
2722		3229
2723	my $y0 = $top;	3230	my $y0 = $top;
2724	my $y1 = $top + $H;	3231	my $y1 = $top + $H;
2725		3232
2726	my $y = 0;
2727
2728	glEnable GL_BLEND;
2729	#TODO# not correct in windows where rgba is forced off
2730	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2731
2732	for my $para (@{$self->{par}}) {	3233	for my $para (@{$self->{par}}) {
2733	my $h = $para->{h};	3234	my $h = $para->{h};
		3235	my $y = $para->{y};
2734		3236
2735	if ($y0 < $y + $h && $y < $y1) {	3237	if ($y0 < $y + $h && $y < $y1) {
2736
2737	my $layout = $self->get_layout ($para);	3238	my $layout = $self->get_layout ($para);
2738		3239
2739	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741	glRasterPos $para->{indent}, $y - $y0;	3240	$layout->render ($para->{indent}, $y - $y0);
2742	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743		3241
2744	if (my @w = @{ $para->{widget} }) {	3242	if (my @w = @{ $para->{widget} }) {
2745	my @s = $layout->get_shapes;	3243	my @s = $layout->get_shapes;
2746		3244
2747	for (@w) {	3245	for (@w) {
…		…
2753	$_->draw;	3251	$_->draw;
2754	}	3252	}
2755	}	3253	}
2756	}	3254	}
2757		3255
2758	$y += $h;	3256	$paridx++;
		3257	$top_paragraph ||= $paridx if $y >= $top;
2759	}	3258	}
2760		3259
2761	glDisable GL_BLEND;	3260	$self->{top_paragraph} = $top_paragraph;
2762	};	3261	};
2763	});	3262	});
2764	}	3263	}
2765		3264
2766	sub reconfigure {	3265	sub reconfigure {
…		…
2784	$self->{children}[1]->draw;	3283	$self->{children}[1]->draw;
2785	}	3284	}
2786		3285
2787	#############################################################################	3286	#############################################################################
2788		3287
2789	package CFClient::UI::Animator;	3288	package CFPlus::UI::Animator;
2790		3289
2791	use CFClient::OpenGL;	3290	use CFPlus::OpenGL;
2792		3291
2793	our @ISA = CFClient::UI::Bin::;	3292	our @ISA = CFPlus::UI::Bin::;
2794		3293
2795	sub moveto {	3294	sub moveto {
2796	my ($self, $x, $y) = @_;	3295	my ($self, $x, $y) = @_;
2797		3296
2798	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3297	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2826	glPopMatrix;	3325	glPopMatrix;
2827	}	3326	}
2828		3327
2829	#############################################################################	3328	#############################################################################
2830		3329
2831	package CFClient::UI::Flopper;	3330	package CFPlus::UI::Flopper;
2832		3331
2833	our @ISA = CFClient::UI::Button::;	3332	our @ISA = CFPlus::UI::Button::;
2834		3333
2835	sub new {	3334	sub new {
2836	my $class = shift;	3335	my $class = shift;
2837		3336
2838	my $self = $class->SUPER::new (	3337	my $self = $class->SUPER::new (
…		…
2850	$self->{other}->toggle_visibility;	3349	$self->{other}->toggle_visibility;
2851	}	3350	}
2852		3351
2853	#############################################################################	3352	#############################################################################
2854		3353
2855	package CFClient::UI::Tooltip;	3354	package CFPlus::UI::Tooltip;
2856		3355
2857	our @ISA = CFClient::UI::Bin::;	3356	our @ISA = CFPlus::UI::Bin::;
2858		3357
2859	use CFClient::OpenGL;	3358	use CFPlus::OpenGL;
2860		3359
2861	sub new {	3360	sub new {
2862	my $class = shift;	3361	my $class = shift;
2863		3362
2864	$class->SUPER::new (	3363	$class->SUPER::new (
…		…
2867	)	3366	)
2868	}	3367	}
2869		3368
2870	sub set_tooltip_from {	3369	sub set_tooltip_from {
2871	my ($self, $widget) = @_;	3370	my ($self, $widget) = @_;
		3371
		3372	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3373	if $widget->{tooltip} =~ /^#(.*)$/;
2872		3374
2873	my $tooltip = $widget->{tooltip};	3375	my $tooltip = $widget->{tooltip};
2874		3376
2875	if ($ENV{CFPLUS_DEBUG} & 2) {	3377	if ($ENV{CFPLUS_DEBUG} & 2) {
2876	$tooltip .= "\n\n" . (ref $widget) . "\n"	3378	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2880	}	3382	}
2881		3383
2882	$tooltip =~ s/^\n+//;	3384	$tooltip =~ s/^\n+//;
2883	$tooltip =~ s/\n+$//;	3385	$tooltip =~ s/\n+$//;
2884		3386
2885	$self->add (new CFClient::UI::Label	3387	$self->add (new CFPlus::UI::Label
2886	markup => $tooltip,	3388	markup => $tooltip,
2887	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3389	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888	fontsize => 0.8,	3390	fontsize => 0.8,
2889	fg => [0, 0, 0, 1],	3391	style => 1, # FLAG_INVERSE
2890	ellipsise => 0,	3392	ellipsise => 0,
2891	font => ($widget->{tooltip_font} || $::FONT_PROP),	3393	font => ($widget->{tooltip_font} || $::FONT_PROP),
2892	);	3394	);
2893	}	3395	}
2894		3396
…		…
2913		3415
2914	$self->{root}->on_post_alloc ("move_$self" => sub {	3416	$self->{root}->on_post_alloc ("move_$self" => sub {
2915	my $widget = $self->{owner}	3417	my $widget = $self->{owner}
2916	or return;	3418	or return;
2917		3419
		3420	if ($widget->{visible}) {
2918	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3421	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919		3422
2920	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3423	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921	if $x + $self->{w} > $self->{root}{w};	3424	if $x + $self->{w} > $self->{root}{w};
2922		3425
2923	$self->move_abs ($x, $y);	3426	$self->move_abs ($x, $y);
		3427	} else {
		3428	$self->hide;
		3429	}
2924	});	3430	});
2925	}	3431	}
2926		3432
2927	sub _draw {	3433	sub _draw {
2928	my ($self) = @_;	3434	my ($self) = @_;
…		…
2952	$self->SUPER::_draw;	3458	$self->SUPER::_draw;
2953	}	3459	}
2954		3460
2955	#############################################################################	3461	#############################################################################
2956		3462
2957	package CFClient::UI::Face;	3463	package CFPlus::UI::Face;
2958		3464
2959	our @ISA = CFClient::UI::Base::;	3465	our @ISA = CFPlus::UI::DrawBG::;
2960		3466
2961	use CFClient::OpenGL;	3467	use CFPlus::OpenGL;
2962		3468
2963	sub new {	3469	sub new {
2964	my $class = shift;	3470	my $class = shift;
2965		3471
2966	my $self = $class->SUPER::new (	3472	my $self = $class->SUPER::new (
		3473	size_w => 32,
		3474	size_h => 8,
2967	aspect => 1,	3475	aspect => 1,
2968	can_events => 0,	3476	can_events => 0,
2969	@_,	3477	@_,
2970	);	3478	);
2971		3479
2972	if ($self->{anim} && $self->{animspeed}) {	3480	if ($self->{anim} && $self->{animspeed}) {
2973	Scalar::Util::weaken (my $widget = $self);	3481	CFPlus::weaken (my $widget = $self);
2974		3482
2975	$self->{timer} = Event->timer (	3483	$self->{timer} = Event->timer (
2976	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3484	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2977	hard => 1,	3485	hard => 1,
2978	interval => $self->{animspeed},	3486	interval => $self->{animspeed},
2979	cb => sub {	3487	cb => sub {
		3488	return unless $::CONN;
		3489
2980	++$widget->{frame};	3490	++$widget->{frame};
		3491	$self->update_face;
2981	$widget->update;	3492	$self->update;
2982	},	3493	},
2983	);	3494	);
		3495
		3496	$self->update_face;
2984	}	3497	}
2985		3498
2986	$self	3499	$self
2987	}	3500	}
2988		3501
		3502	sub update_face {
		3503	my ($self) = @_;
		3504
		3505	return unless $::CONN;
		3506
		3507	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3508	if ($anim && @$anim) {
		3509	delete $self->{wait_face};
		3510	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3511	}
		3512	}
		3513	}
		3514
2989	sub size_request {	3515	sub size_request {
2990	(32, 8)	3516	my ($self) = @_;
		3517
		3518	if ($::CONN) {
		3519	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3520	if (my $tex = $::CONN->{texture}[$faceid]) {
		3521	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3522	} else {
		3523	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3524	$self->realloc;
		3525	});
		3526	}
		3527	}
		3528	}
		3529
		3530	($self->{size_w} || 8, $self->{size_h} || 8)
2991	}	3531	}
2992		3532
2993	sub update {	3533	sub update {
2994	my ($self) = @_;	3534	my ($self) = @_;
2995		3535
…		…
3001	sub _draw {	3541	sub _draw {
3002	my ($self) = @_;	3542	my ($self) = @_;
3003		3543
3004	return unless $::CONN;	3544	return unless $::CONN;
3005		3545
3006	my $face;	3546	$self->SUPER::_draw;
3007		3547
3008	if ($self->{frame}) {
3009	my $anim = $::CONN->{anim}[$self->{anim}];	3548	my $faceid = $::CONN->{faceid}[$self->{face}]
3010		3549	or return;
3011	$face = $anim->[ $self->{frame} % @$anim ]
3012	if $anim && @$anim;
3013	}
3014		3550
3015	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3551	my $tex = $::CONN->{texture}[$faceid];
3016		3552
3017	if ($tex) {	3553	if ($tex) {
3018	glEnable GL_TEXTURE_2D;	3554	glEnable GL_TEXTURE_2D;
3019	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3555	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3020	glColor 0, 0, 0, 1;	3556	glColor 0, 0, 0, 1;
…		…
3032	$self->SUPER::destroy;	3568	$self->SUPER::destroy;
3033	}	3569	}
3034		3570
3035	#############################################################################	3571	#############################################################################
3036		3572
3037	package CFClient::UI::Buttonbar;	3573	package CFPlus::UI::Buttonbar;
3038		3574
3039	our @ISA = CFClient::UI::HBox::;	3575	our @ISA = CFPlus::UI::HBox::;
3040		3576
3041	# TODO: should actualyl wrap buttons and other goodies.	3577	# TODO: should actually wrap buttons and other goodies.
3042		3578
3043	#############################################################################	3579	#############################################################################
3044		3580
3045	package CFClient::UI::Menu;	3581	package CFPlus::UI::Menu;
3046		3582
3047	our @ISA = CFClient::UI::FancyFrame::;	3583	our @ISA = CFPlus::UI::Toplevel::;
3048		3584
3049	use CFClient::OpenGL;	3585	use CFPlus::OpenGL;
3050		3586
3051	sub new {	3587	sub new {
3052	my $class = shift;	3588	my $class = shift;
3053		3589
3054	my $self = $class->SUPER::new (	3590	my $self = $class->SUPER::new (
3055	items => [],	3591	items => [],
3056	z => 100,	3592	z => 100,
3057	@_,	3593	@_,
3058	);	3594	);
3059		3595
3060	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3596	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061		3597
3062	for my $item (@{ $self->{items} }) {	3598	for my $item (@{ $self->{items} }) {
3063	my ($widget, $cb, $tooltip) = @$item;	3599	my ($widget, $cb, $tooltip) = @$item;
3064		3600
3065	# handle various types of items, only text for now	3601	# handle various types of items, only text for now
3066	if (!ref $widget) {	3602	if (!ref $widget) {
		3603	if ($widget =~ /\t/) {
		3604	my ($left, $right) = split /\t/, $widget, 2;
		3605
3067	$widget = new CFClient::UI::Label	3606	$widget = new CFPlus::UI::HBox
3068	can_hover => 1,	3607	can_hover => 1,
3069	can_events => 1,	3608	can_events => 1,
		3609	tooltip => $tooltip,
		3610	children => [
		3611	(new CFPlus::UI::Label markup => $left, expand => 1),
		3612	(new CFPlus::UI::Label markup => $right, align => +1),
		3613	],
		3614	;
		3615
		3616	} else {
		3617	$widget = new CFPlus::UI::Label
		3618	can_hover => 1,
		3619	can_events => 1,
3070	markup => $widget,	3620	markup => $widget,
3071	tooltip => $tooltip	3621	tooltip => $tooltip;
		3622	}
3072	}	3623	}
3073		3624
3074	$self->{item}{$widget} = $item;	3625	$self->{item}{$widget} = $item;
3075		3626
3076	$self->{vbox}->add ($widget);	3627	$self->{vbox}->add ($widget);
…		…
3119	1	3670	1
3120	}	3671	}
3121		3672
3122	#############################################################################	3673	#############################################################################
3123		3674
3124	package CFClient::UI::Multiplexer;	3675	package CFPlus::UI::Multiplexer;
3125		3676
3126	our @ISA = CFClient::UI::Container::;	3677	our @ISA = CFPlus::UI::Container::;
3127		3678
3128	sub new {	3679	sub new {
3129	my $class = shift;	3680	my $class = shift;
3130		3681
3131	my $self = $class->SUPER::new (	3682	my $self = $class->SUPER::new (
…		…
3145		3696
3146	$self->{current} = $self->{children}[0]	3697	$self->{current} = $self->{children}[0]
3147	if @{ $self->{children} };	3698	if @{ $self->{children} };
3148	}	3699	}
3149		3700
		3701	sub get_current_page {
		3702	my ($self) = @_;
		3703
		3704	$self->{current}
		3705	}
		3706
3150	sub set_current_page {	3707	sub set_current_page {
3151	my ($self, $page_or_widget) = @_;	3708	my ($self, $page_or_widget) = @_;
3152		3709
3153	my $widget = ref $page_or_widget	3710	my $widget = ref $page_or_widget
3154	? $page_or_widget	3711	? $page_or_widget
…		…
3186	$self->{current}->draw;	3743	$self->{current}->draw;
3187	}	3744	}
3188		3745
3189	#############################################################################	3746	#############################################################################
3190		3747
3191	package CFClient::UI::Notebook;	3748	package CFPlus::UI::Notebook;
3192		3749
3193	our @ISA = CFClient::UI::VBox::;	3750	our @ISA = CFPlus::UI::VBox::;
3194		3751
3195	sub new {	3752	sub new {
3196	my $class = shift;	3753	my $class = shift;
3197		3754
3198	my $self = $class->SUPER::new (	3755	my $self = $class->SUPER::new (
3199	buttonbar => (new CFClient::UI::Buttonbar),	3756	buttonbar => (new CFPlus::UI::Buttonbar),
3200	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3757	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3201	# filter => # will be put between multiplexer and $self	3758	# filter => # will be put between multiplexer and $self
3202	@_,	3759	@_,
3203	);	3760	);
3204		3761
3205	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3762	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3209	}	3766	}
3210		3767
3211	sub add {	3768	sub add {
3212	my ($self, $title, $widget, $tooltip) = @_;	3769	my ($self, $title, $widget, $tooltip) = @_;
3213		3770
3214	Scalar::Util::weaken $self;	3771	CFPlus::weaken $self;
3215		3772
3216	$self->{buttonbar}->add (new CFClient::UI::Button	3773	$self->{buttonbar}->add (new CFPlus::UI::Button
3217	markup => $title,	3774	markup => $title,
3218	tooltip => $tooltip,	3775	tooltip => $tooltip,
3219	on_activate => sub { $self->set_current_page ($widget) },	3776	on_activate => sub { $self->set_current_page ($widget) },
3220	);	3777	);
3221		3778
3222	$self->{multiplexer}->add ($widget);	3779	$self->{multiplexer}->add ($widget);
3223	}	3780	}
3224		3781
		3782	sub get_current_page {
		3783	my ($self) = @_;
		3784
		3785	$self->{multiplexer}->get_current_page
		3786	}
		3787
3225	sub set_current_page {	3788	sub set_current_page {
3226	my ($self, $page) = @_;	3789	my ($self, $page) = @_;
3227		3790
3228	$self->{multiplexer}->set_current_page ($page);	3791	$self->{multiplexer}->set_current_page ($page);
3229	$self->emit (page_changed => $self->{multiplexer}{current});	3792	$self->emit (page_changed => $self->{multiplexer}{current});
3230	}	3793	}
3231		3794
3232	#############################################################################	3795	#############################################################################
3233		3796
3234	package CFClient::UI::Combobox;	3797	package CFPlus::UI::Selector;
3235		3798
3236	use utf8;	3799	use utf8;
3237		3800
3238	our @ISA = CFClient::UI::Button::;	3801	our @ISA = CFPlus::UI::Button::;
3239		3802
3240	sub new {	3803	sub new {
3241	my $class = shift;	3804	my $class = shift;
3242		3805
3243	my $self = $class->SUPER::new (	3806	my $self = $class->SUPER::new (
…		…
3260	my ($value, $title, $tooltip) = @$_;	3823	my ($value, $title, $tooltip) = @$_;
3261		3824
3262	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3825	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263	}	3826	}
3264		3827
3265	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3828	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266	}	3829	}
3267		3830
3268	sub _set_value {	3831	sub _set_value {
3269	my ($self, $value) = @_;	3832	my ($self, $value) = @_;
3270		3833
…		…
3285	$self->emit (changed => $value);	3848	$self->emit (changed => $value);
3286	}	3849	}
3287		3850
3288	#############################################################################	3851	#############################################################################
3289		3852
3290	package CFClient::UI::Statusbox;	3853	package CFPlus::UI::Statusbox;
3291		3854
3292	our @ISA = CFClient::UI::VBox::;	3855	our @ISA = CFPlus::UI::VBox::;
3293		3856
3294	sub new {	3857	sub new {
3295	my $class = shift;	3858	my $class = shift;
3296		3859
3297	my $self = $class->SUPER::new (	3860	my $self = $class->SUPER::new (
3298	fontsize => 0.8,	3861	fontsize => 0.8,
3299	@_,	3862	@_,
3300	);	3863	);
3301		3864
3302	Scalar::Util::weaken (my $this = $self);	3865	CFPlus::weaken (my $this = $self);
3303		3866
3304	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3867	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305		3868
3306	$self	3869	$self
3307	}	3870	}
…		…
3309	sub reorder {	3872	sub reorder {
3310	my ($self) = @_;	3873	my ($self) = @_;
3311	my $NOW = Time::HiRes::time;	3874	my $NOW = Time::HiRes::time;
3312		3875
3313	# freeze display when hovering over any label	3876	# freeze display when hovering over any label
3314	return if $CFClient::UI::TOOLTIP->{owner}	3877	return if $CFPlus::UI::TOOLTIP->{owner}
3315	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3878	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3316	values %{ $self->{item} };	3879	values %{ $self->{item} };
3317		3880
3318	while (my ($k, $v) = each %{ $self->{item} }) {	3881	while (my ($k, $v) = each %{ $self->{item} }) {
3319	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3882	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3320	}	3883	}
…		…
3341	for ($short) {	3904	for ($short) {
3342	s/^\s+//;	3905	s/^\s+//;
3343	s/\s+/ /g;	3906	s/\s+/ /g;
3344	}	3907	}
3345		3908
3346	new CFClient::UI::Label	3909	new CFPlus::UI::Label
3347	markup => $short,	3910	markup => $short,
3348	tooltip => $item->{tooltip},	3911	tooltip => $item->{tooltip},
3349	tooltip_font => $::FONT_PROP,	3912	tooltip_font => $::FONT_PROP,
3350	tooltip_width => 0.67,	3913	tooltip_width => 0.67,
3351	fontsize => $item->{fontsize} || $self->{fontsize},	3914	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3405	count => 1,	3968	count => 1,
3406	%arg,	3969	%arg,
3407	};	3970	};
3408	}	3971	}
3409		3972
		3973	$ROOT->on_refresh (reorder => sub {
3410	$self->reorder;	3974	$self->reorder;
		3975	});
3411	}	3976	}
3412		3977
3413	sub reconfigure {	3978	sub reconfigure {
3414	my ($self) = @_;	3979	my ($self) = @_;
3415		3980
…		…
3428	$self->SUPER::destroy;	3993	$self->SUPER::destroy;
3429	}	3994	}
3430		3995
3431	#############################################################################	3996	#############################################################################
3432		3997
3433	package CFClient::UI::Inventory;
3434
3435	our @ISA = CFClient::UI::ScrolledWindow::;
3436
3437	sub new {
3438	my $class = shift;
3439
3440	my $self = $class->SUPER::new (
3441	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3442	@_,
3443	);
3444
3445	$self
3446	}
3447
3448	sub set_items {
3449	my ($self, $items) = @_;
3450
3451	$self->{child}->clear;
3452	return unless $items;
3453
3454	my @items = sort {
3455	($a->{type} <=> $b->{type})
3456	or ($a->{name} cmp $b->{name})
3457	} @$items;
3458
3459	$self->{real_items} = \@items;
3460
3461	my $row = 0;
3462	for my $item (@items) {
3463	CFClient::Item::update_widgets $item;
3464
3465	$self->{child}->add (0, $row, $item->{face_widget});
3466	$self->{child}->add (1, $row, $item->{desc_widget});
3467	$self->{child}->add (2, $row, $item->{weight_widget});
3468
3469	$row++;
3470	}
3471	}
3472
3473	#############################################################################
3474
3475	package CFClient::UI::BindEditor;
3476
3477	our @ISA = CFClient::UI::FancyFrame::;
3478
3479	sub new {
3480	my $class = shift;
3481
3482	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3483
3484	$self->add (my $vb = new CFClient::UI::VBox);
3485
3486
3487	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3488	text => "start recording",
3489	tooltip => "Start/Stops recording of actions."
3490	."All subsequent actions after the recording started will be captured."
3491	."The actions are displayed after the record was stopped."
3492	."To bind the action you have to click on the 'Bind' button",
3493	on_activate => sub {
3494	unless ($self->{recording}) {
3495	$self->start;
3496	} else {
3497	$self->stop;
3498	}
3499	});
3500
3501	$vb->add (new CFClient::UI::Label text => "Actions:");
3502	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3503
3504	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3505	$vb->add (my $hb = new CFClient::UI::HBox);
3506	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3507	$hb->add (new CFClient::UI::Button
3508	text => "bind",
3509	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3510	on_activate => sub {
3511	$self->ask_for_bind;
3512	});
3513
3514	$vb->add (my $hb = new CFClient::UI::HBox);
3515	$hb->add (new CFClient::UI::Button
3516	text => "ok",
3517	expand => 1,
3518	tooltip => "This closes the binding editor and saves the binding",
3519	on_activate => sub {
3520	$self->hide;
3521	$self->commit;
3522	});
3523
3524	$hb->add (new CFClient::UI::Button
3525	text => "cancel",
3526	expand => 1,
3527	tooltip => "This closes the binding editor without saving",
3528	on_activate => sub {
3529	$self->hide;
3530	$self->{binding_cancel}->()
3531	if $self->{binding_cancel};
3532	});
3533
3534	$self->update_binding_widgets;
3535
3536	$self
3537	}
3538
3539	sub cfg_bind {
3540	my ($self, $mod, $sym, $cmds) = @_;
3541	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542	::update_bindings ();
3543	}
3544
3545	sub cfg_unbind {
3546	my ($self, $mod, $sym, $cmds) = @_;
3547	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548	::update_bindings ();
3549	}
3550
3551	sub commit {
3552	my ($self) = @_;
3553	my ($mod, $sym, $cmds) = $self->get_binding;
3554	if ($sym != 0 && @$cmds > 0) {
3555	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3556	."'. Don't forget 'Save Config'!");
3557	$self->{binding_change}->($mod, $sym, $cmds)
3558	if $self->{binding_change};
3559	} else {
3560	$::STATUSBOX->add ("No action bound, no key or action specified!");
3561	$self->{binding_cancel}->()
3562	if $self->{binding_cancel};
3563	}
3564	}
3565
3566	sub start {
3567	my ($self) = @_;
3568
3569	$self->{rec_btn}->set_text ("stop recording");
3570	$self->{recording} = 1;
3571	$self->clear_command_list;
3572	$::CONN->start_record if $::CONN;
3573	}
3574
3575	sub stop {
3576	my ($self) = @_;
3577
3578	$self->{rec_btn}->set_text ("start recording");
3579	$self->{recording} = 0;
3580
3581	my $rec;
3582	$rec = $::CONN->stop_record if $::CONN;
3583	return unless ref $rec eq 'ARRAY';
3584	$self->set_command_list ($rec);
3585	}
3586
3587
3588	sub ask_for_bind_and_commit {
3589	my ($self) = @_;
3590	$self->ask_for_bind (1);
3591	}
3592
3593	sub ask_for_bind {
3594	my ($self, $commit, $end_cb) = @_;
3595
3596	CFClient::Binder::open_binding_dialog (sub {
3597	my ($mod, $sym) = @_;
3598	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3599	$self->update_binding_widgets;
3600	$self->commit if $commit;
3601	$end_cb->() if $end_cb;
3602	});
3603	}
3604
3605	# $mod and $sym are the modifiers and key symbol
3606	# $cmds is a array ref of strings (the commands)
3607	# $cb is the callback that is executed on OK
3608	# $ccb is the callback that is executed on CANCEL and
3609	# when the binding was unsuccessful on OK
3610	sub set_binding {
3611	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3612
3613	$self->clear_command_list;
3614	$self->{recording} = 0;
3615	$self->{rec_btn}->set_text ("start recording");
3616
3617	$self->{binding} = [$mod, $sym];
3618	$self->{commands} = $cmds;
3619
3620	$self->{binding_change} = $cb;
3621	$self->{binding_cancel} = $ccb;
3622
3623	$self->update_binding_widgets;
3624	}
3625
3626	# this is a shortcut method that asks for a binding
3627	# and then just binds it.
3628	sub do_quick_binding {
3629	my ($self, $cmds, $end_cb) = @_;
3630	$self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3631	$self->ask_for_bind (1, $end_cb);
3632	}
3633
3634	sub update_binding_widgets {
3635	my ($self) = @_;
3636	my ($mod, $sym, $cmds) = $self->get_binding;
3637	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3638	$self->set_command_list ($cmds);
3639	}
3640
3641	sub get_binding {
3642	my ($self) = @_;
3643	return (
3644	$self->{binding}->[0],
3645	$self->{binding}->[1],
3646	[ grep { defined $_ } @{$self->{commands}} ]
3647	);
3648	}
3649
3650	sub clear_command_list {
3651	my ($self) = @_;
3652	$self->{cmdbox}->clear ();
3653	}
3654
3655	sub set_command_list {
3656	my ($self, $cmds) = @_;
3657
3658	$self->{cmdbox}->clear ();
3659	$self->{commands} = $cmds;
3660
3661	my $idx = 0;
3662
3663	for (@$cmds) {
3664	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3665
3666	my $i = $idx;
3667	$hb->add (new CFClient::UI::Label text => $_);
3668	$hb->add (new CFClient::UI::Button
3669	text => "delete",
3670	tooltip => "Deletes the action from the record",
3671	on_activate => sub {
3672	$self->{cmdbox}->remove ($hb);
3673	$cmds->[$i] = undef;
3674	});
3675
3676
3677	$idx++
3678	}
3679	}
3680
3681	#############################################################################
3682
3683	package CFClient::UI::SpellList;
3684
3685	our @ISA = CFClient::UI::Table::;
3686
3687	sub new {
3688	my $class = shift;
3689
3690	my $self = $class->SUPER::new (
3691	binding => [],
3692	commands => [],
3693	@_,
3694	)
3695	}
3696
3697	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3698
3699	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3701	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3709
3710	sub rebuild_spell_list {
3711	my ($self) = @_;
3712
3713	$CFClient::UI::ROOT->on_refresh ($self => sub {
3714	$self->clear;
3715
3716	return unless $::CONN;
3717
3718	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724	my $row = 0;
3725
3726	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727	my $spell = $self->{spell}{$_};
3728
3729	$row++;
3730
3731	my $spell_cb = sub {
3732	my ($widget, $ev) = @_;
3733
3734	if ($ev->{button} == 1) {
3735	$::CONN->user_send ("cast $spell->{name}");
3736	} elsif ($ev->{button} == 2) {
3737	$::CONN->user_send ("invoke $spell->{name}");
3738	} elsif ($ev->{button} == 3) {
3739	(new CFClient::UI::Menu
3740	items => [
3741	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743	],
3744	)->popup ($ev);
3745	} else {
3746	return 0;
3747	}
3748
3749	1
3750	};
3751
3752	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754	#TODO: add path info to tooltip
3755	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757	$self->add (0, $row, new CFClient::UI::Face
3758	face => $spell->{face},
3759	can_hover => 1,
3760	can_events => 1,
3761	tooltip => $tooltip,
3762	on_button_down => $spell_cb,
3763	);
3764
3765	$self->add (1, $row, new CFClient::UI::Label
3766	expand => 1,
3767	text => $spell->{name},
3768	can_hover => 1,
3769	can_events => 1,
3770	tooltip => $tooltip,
3771	on_button_down => $spell_cb,
3772	);
3773
3774	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778	}
3779	});
3780	}
3781
3782	sub add_spell {
3783	my ($self, $spell) = @_;
3784
3785	$self->{spell}->{$spell->{name}} = $spell;
3786	$self->rebuild_spell_list;
3787	}
3788
3789	sub remove_spell {
3790	my ($self, $spell) = @_;
3791
3792	delete $self->{spell}->{$spell->{name}};
3793	$self->rebuild_spell_list;
3794	}
3795
3796	sub clear_spells {
3797	my ($self) = @_;
3798
3799	$self->{spell} = {};
3800	$self->rebuild_spell_list;
3801	}
3802
3803	#############################################################################
3804
3805	package CFClient::UI::Root;	3998	package CFPlus::UI::Root;
3806		3999
3807	our @ISA = CFClient::UI::Container::;	4000	our @ISA = CFPlus::UI::Container::;
3808		4001
3809	use List::Util qw(min max);	4002	use List::Util qw(min max);
3810		4003
3811	use CFClient::OpenGL;	4004	use CFPlus::OpenGL;
3812		4005
3813	sub new {	4006	sub new {
3814	my $class = shift;	4007	my $class = shift;
3815		4008
3816	my $self = $class->SUPER::new (	4009	my $self = $class->SUPER::new (
3817	visible => 1,	4010	visible => 1,
3818	@_,	4011	@_,
3819	);	4012	);
3820		4013
3821	Scalar::Util::weaken ($self->{root} = $self);	4014	CFPlus::weaken ($self->{root} = $self);
3822		4015
3823	$self	4016	$self
3824	}	4017	}
3825		4018
3826	sub size_request {	4019	sub size_request {
…		…
3992	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4185	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3993		4186
3994	$w = 0 if $w < 0;	4187	$w = 0 if $w < 0;
3995	$h = 0 if $h < 0;	4188	$h = 0 if $h < 0;
3996		4189
		4190	$w = max $widget->{min_w}, $w;
		4191	$h = max $widget->{min_h}, $h;
		4192
		4193	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4194	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4195
		4196	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4197	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4198
3997	$w = int $w + 0.5;	4199	$w = int $w + 0.5;
3998	$h = int $h + 0.5;	4200	$h = int $h + 0.5;
3999		4201
4000	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4202	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001	$widget->{old_w} = $widget->{w};	4203	$widget->{old_w} = $widget->{w};
…		…
4024	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4226	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4025	glMatrixMode GL_MODELVIEW;	4227	glMatrixMode GL_MODELVIEW;
4026	glLoadIdentity;	4228	glLoadIdentity;
4027		4229
4028	{	4230	{
4029	package CFClient::UI::Base;	4231	package CFPlus::UI::Base;
4030		4232
4031	($draw_x, $draw_y, $draw_w, $draw_h) =	4233	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4032	(0, 0, $self->{w}, $self->{h});	4234	(0, 0, $self->{w}, $self->{h});
4033	}
4034		4235
4035	$self->_draw;	4236	$self->_draw;
		4237	}
4036	}	4238	}
4037		4239
4038	#############################################################################	4240	#############################################################################
4039		4241
4040	package CFClient::UI;	4242	package CFPlus::UI;
4041		4243
4042	$ROOT = new CFClient::UI::Root;	4244	$ROOT = new CFPlus::UI::Root;
4043	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4245	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4044		4246
4045	1	4247	1
4046		4248

Diff Legend

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