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.374 by root, Mon Jul 16 12:36:48 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
873	our @ISA = CFClient::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
874		950
875	sub new {	951	sub new {
876	my $class = shift;	952	my $class = shift;
877		953
878	$class->SUPER::new (	954	$class->SUPER::new (
…		…
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1016	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1017	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	1018	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1019	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1020	}
945	}	1021	}
946		1022
947	sub _render {	1023	sub _render {
948	my ($self) = @_;	1024	my ($self) = @_;
949		1025
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1026	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1027	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1028
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1029	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1030
955	$self->SUPER::_render;	1031	$self->SUPER::_render;
956	}	1032	}
957		1033
958	#############################################################################	1034	#############################################################################
959		1035
960	package CFClient::UI::ScrolledWindow;	1036	package CFPlus::UI::ScrolledWindow;
961		1037
962	our @ISA = CFClient::UI::HBox::;	1038	our @ISA = CFPlus::UI::Table::;
963		1039
964	sub new {	1040	sub new {
965	my ($class, %arg) = @_;	1041	my ($class, %arg) = @_;
966		1042
967	my $child = delete $arg{child};	1043	my $child = delete $arg{child};
968		1044
969	my $self;	1045	my $self;
970		1046
971	my $slider = new CFClient::UI::Slider	1047	my $hslider = new CFPlus::UI::Slider
		1048	vertical => 0,
		1049	range => [0, 0, 1, 0.01], # HACK fix
		1050	on_changed => sub {
		1051	$self->{hpos} = $_[1];
		1052	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1053	},
		1054	;
		1055
		1056	my $vslider = new CFPlus::UI::Slider
972	vertical => 1,	1057	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1058	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1059	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1060	$self->{vpos} = $_[1];
		1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976	},	1062	},
977	;	1063	;
978		1064
979	$self = $class->SUPER::new (	1065	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1066	scroll_x => 0,
		1067	scroll_y => 1,
		1068	can_events => 1,
981	slider => $slider,	1069	hslider => $hslider,
		1070	vslider => $vslider,
		1071	col_expand => [1, 0],
		1072	row_expand => [1, 0],
982	%arg,	1073	%arg,
983	);	1074	);
984		1075
		1076	$self->{vp} = new CFPlus::UI::ViewPort
		1077	expand => 1,
		1078	scroll_x => $self->{scroll_x},
		1079	scroll_y => $self->{scroll_y},
		1080	;
		1081
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1082	$self->SUPER::add (0, 0, $self->{vp});
		1083
986	$self->add ($child) if $child;	1084	$self->add ($child) if $child;
987		1085
988	$self	1086	$self
989	}	1087	}
		1088
		1089	#TODO# update range on size_allocate depending on child
990		1090
991	sub add {	1091	sub add {
992	my ($self, $widget) = @_;	1092	my ($self, $widget) = @_;
993		1093
994	$self->{vp}->add ($self->{child} = $widget);	1094	$self->{vp}->add ($self->{child} = $widget);
995	}	1095	}
996		1096
		1097	sub invoke_mouse_wheel {
		1098	my ($self, $ev) = @_;
		1099
		1100	return 0 unless $ev->{dy}; # only vertical movements for now
		1101
		1102	$self->{vslider}->emit (mouse_wheel => $ev);
		1103
		1104	1
		1105	}
		1106
		1107	sub update_slider {
		1108	my ($self) = @_;
		1109
		1110	my $child = ($self->{vp} or return)->child;
		1111
		1112	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1113	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1114
		1115	my $visible = $w1 > $w2;
		1116	if ($visible != $self->{hslider}{visible}) {
		1117	$visible ? $self->SUPER::add (0, 1, $self->{hslider})
		1118	: $self->{hslider}->hide;
		1119	}
		1120
		1121	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1122	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1123
		1124	my $visible = $h1 > $h2;
		1125	if ($visible != $self->{vslider}{visible}) {
		1126	$visible ? $self->SUPER::add (1, 0, $self->{vslider})
		1127	: $self->{vslider}->hide;
		1128	}
		1129	}
		1130
997	sub update {	1131	sub update {
998	my ($self) = @_;	1132	my ($self) = @_;
999		1133
1000	$self->SUPER::update;	1134	$self->SUPER::update;
1001		1135	$self->update_slider;
1002	# todo: overwrite size_allocate of child
1003	my $child = $self->{vp}->child;
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005	}	1136	}
1006		1137
1007	sub invoke_size_allocate {	1138	sub invoke_size_allocate {
1008	my ($self, $w, $h) = @_;	1139	my ($self, $w, $h) = @_;
1009		1140
1010	my $child = $self->{vp}->child;	1141	$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)	1142	$self->SUPER::invoke_size_allocate ($w, $h)
1014	}	1143	}
1015		1144
1016	#TODO# update range on size_allocate depending on child
1017	# update viewport offset on scroll
1018
1019	#############################################################################	1145	#############################################################################
1020		1146
1021	package CFClient::UI::Frame;	1147	package CFPlus::UI::Frame;
1022		1148
1023	our @ISA = CFClient::UI::Bin::;	1149	our @ISA = CFPlus::UI::Bin::;
1024		1150
1025	use CFClient::OpenGL;	1151	use CFPlus::OpenGL;
1026		1152
1027	sub new {	1153	sub new {
1028	my $class = shift;	1154	my $class = shift;
1029		1155
1030	$class->SUPER::new (	1156	$class->SUPER::new (
…		…
1056	$self->SUPER::_draw;	1182	$self->SUPER::_draw;
1057	}	1183	}
1058		1184
1059	#############################################################################	1185	#############################################################################
1060		1186
1061	package CFClient::UI::FancyFrame;	1187	package CFPlus::UI::FancyFrame;
1062		1188
1063	our @ISA = CFClient::UI::Bin::;	1189	our @ISA = CFPlus::UI::Bin::;
1064		1190
1065	use CFClient::OpenGL;	1191	use CFPlus::OpenGL;
		1192
		1193	sub new {
		1194	my ($class, %arg) = @_;
		1195
		1196	if ((exists $arg{label}) && !ref $arg{label}) {
		1197	$arg{label} = new CFPlus::UI::Label
		1198	align => 1,
		1199	valign => 0,
		1200	text => $arg{label},
		1201	fontsize => ($arg{border} || 0.8) * 0.75;
		1202	}
		1203
		1204	my $self = $class->SUPER::new (
		1205	# label => "",
		1206	fg => [0.6, 0.3, 0.1],
		1207	border => 0.8,
		1208	style => 'single',
		1209	%arg,
		1210	);
		1211
		1212	$self
		1213	}
		1214
		1215	sub add {
		1216	my ($self, @widgets) = @_;
		1217
		1218	$self->SUPER::add (@widgets);
		1219	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1220	}
		1221
		1222	sub border {
		1223	int $_[0]{border} * $::FONTSIZE
		1224	}
		1225
		1226	sub size_request {
		1227	my ($self) = @_;
		1228
		1229	($self->{label_w}, undef) = $self->{label}->size_request
		1230	if $self->{label};
		1231
		1232	my ($w, $h) = $self->SUPER::size_request;
		1233
		1234	(
		1235	$w + $self->border * 2,
		1236	$h + $self->border * 2,
		1237	)
		1238	}
		1239
		1240	sub invoke_size_allocate {
		1241	my ($self, $w, $h) = @_;
		1242
		1243	my $border = $self->border;
		1244
		1245	$w -= List::Util::max 0, $border * 2;
		1246	$h -= List::Util::max 0, $border * 2;
		1247
		1248	if (my $label = $self->{label}) {
		1249	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1250	$label->{h} = List::Util::min $h, $border;
		1251	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1252	}
		1253
		1254	$self->child->configure ($border, $border, $w, $h);
		1255
		1256	1
		1257	}
		1258
		1259	sub _draw {
		1260	my ($self) = @_;
		1261
		1262	my $child = $self->{children}[0];
		1263
		1264	my $border = $self->border;
		1265	my ($w, $h) = ($self->{w}, $self->{h});
		1266
		1267	$child->draw;
		1268
		1269	glColor @{$self->{fg}};
		1270	glBegin GL_LINE_STRIP;
		1271	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1272	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1273	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1274	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1275	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1276	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1277	glEnd;
		1278
		1279	if ($self->{label}) {
		1280	glTranslate $border * 2, 0;
		1281	$self->{label}->_draw;
		1282	}
		1283	}
		1284
		1285	#############################################################################
		1286
		1287	package CFPlus::UI::Toplevel;
		1288
		1289	our @ISA = CFPlus::UI::Bin::;
		1290
		1291	use CFPlus::OpenGL;
1066		1292
1067	my $bg =	1293	my $bg =
1068	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1294	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069	mipmap => 1, wrap => 1;	1295	mipmap => 1, wrap => 1;
1070		1296
1071	my @border =	1297	my @border =
1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1298	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);	1299	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074		1300
1075	sub new {	1301	sub new {
1076	my ($class, %arg) = @_;	1302	my ($class, %arg) = @_;
1077		1303
1078	my $self = $class->SUPER::new (	1304	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1305	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1306	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1307	border => 0.6,
1082	can_events => 1,	1308	can_events => 1,
1083	min_w => 16,	1309	min_w => 64,
1084	min_h => 16,	1310	min_h => 32,
1085	%arg,	1311	%arg,
1086	);	1312	);
1087		1313
1088	$self->{title_widget} = new CFClient::UI::Label	1314	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1315	align => 0,
1090	valign => 1,	1316	valign => 1,
1091	text => $self->{title},	1317	text => $self->{title},
1092	fontsize => $self->{border},	1318	fontsize => $self->{border},
1093	if exists $self->{title};	1319	if exists $self->{title};
1094		1320
1095	if ($self->{has_close_button}) {	1321	if ($self->{has_close_button}) {
1096	$self->{close_button} =	1322	$self->{close_button} =
1097	new CFClient::UI::ImageButton	1323	new CFPlus::UI::ImageButton
1098	path => 'x1_close.png',	1324	path => 'x1_close.png',
1099	on_activate => sub { $self->hide };	1325	on_activate => sub { $self->emit ("delete") };
1100		1326
1101	$self->CFClient::UI::Container::add ($self->{close_button});	1327	$self->CFPlus::UI::Container::add ($self->{close_button});
1102	}	1328	}
1103		1329
1104	$self	1330	$self
1105	}	1331	}
1106		1332
1107	sub add {	1333	sub add {
1108	my ($self, @widgets) = @_;	1334	my ($self, @widgets) = @_;
1109		1335
1110	$self->SUPER::add (@widgets);	1336	$self->SUPER::add (@widgets);
1111	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1337	$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};	1338	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113	}	1339	}
1114		1340
1115	sub border {	1341	sub border {
1116	int $_[0]{border} * $::FONTSIZE	1342	int $_[0]{border} * $::FONTSIZE
1117	}	1343	}
…		…
1150	$self->child->configure ($border, $border, $w, $h);	1376	$self->child->configure ($border, $border, $w, $h);
1151		1377
1152	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1378	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153	if $self->{close_button};	1379	if $self->{close_button};
1154		1380
		1381	1
		1382	}
		1383
		1384	sub invoke_delete {
		1385	my ($self) = @_;
		1386
		1387	$self->hide;
		1388
1155	1	1389	1
1156	}	1390	}
1157		1391
1158	sub invoke_button_down {	1392	sub invoke_button_down {
1159	my ($self, $ev, $x, $y) = @_;	1393	my ($self, $ev, $x, $y) = @_;
…		…
1217	$self->{motion}->($ev, $x, $y) if $self->{motion};	1451	$self->{motion}->($ev, $x, $y) if $self->{motion};
1218		1452
1219	! ! $self->{motion}	1453	! ! $self->{motion}
1220	}	1454	}
1221		1455
		1456	sub invoke_visibility_change {
		1457	my ($self, $visible) = @_;
		1458
		1459	delete $self->{motion} unless $visible;
		1460
		1461	0
		1462	}
		1463
1222	sub _draw {	1464	sub _draw {
1223	my ($self) = @_;	1465	my ($self) = @_;
1224		1466
1225	my $child = $self->{children}[0];	1467	my $child = $self->{children}[0];
1226		1468
…		…
1263	if $self->{close_button};	1505	if $self->{close_button};
1264	}	1506	}
1265		1507
1266	#############################################################################	1508	#############################################################################
1267		1509
1268	package CFClient::UI::Table;	1510	package CFPlus::UI::Table;
1269		1511
1270	our @ISA = CFClient::UI::Base::;	1512	our @ISA = CFPlus::UI::Base::;
1271		1513
1272	use List::Util qw(max sum);	1514	use List::Util qw(max sum);
1273		1515
1274	use CFClient::OpenGL;	1516	use CFPlus::OpenGL;
1275		1517
1276	sub new {	1518	sub new {
1277	my $class = shift;	1519	my $class = shift;
1278		1520
1279	$class->SUPER::new (	1521	$class->SUPER::new (
		1522	children => [],
1280	col_expand => [],	1523	col_expand => [],
		1524	row_expand => [],
1281	@_,	1525	@_,
1282	)	1526	)
1283	}	1527	}
1284		1528
1285	sub children {	1529	sub children {
1286	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1530	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287	}	1531	}
1288		1532
		1533	# TODO: store row/col info in child widget and use standard add/del
1289	sub add {	1534	sub add {
1290	my ($self, $x, $y, $child) = @_;	1535	my ($self) = shift;
1291		1536
		1537	while (@_) {
		1538	my ($x, $y, $child) = splice @_, 0, 3, ();
1292	$child->set_parent ($self);	1539	$child->set_parent ($self);
1293	$self->{children}[$y][$x] = $child;	1540	$self->{children}[$y][$x] = $child;
		1541	}
1294		1542
		1543	$self->{force_realloc} = 1;
		1544	$self->{force_size_alloc} = 1;
1295	$self->realloc;	1545	$self->realloc;
1296	}	1546	}
1297		1547
1298	sub remove {	1548	sub remove {
1299	my ($self, $child) = @_;	1549	my ($self, $child) = @_;
1300		1550
1301	# TODO: not yet implemented	1551	for (@{ $self->{children} }) {
		1552	for (@{ $_ || [] }) {
		1553	$_ = undef if $_ == $child;
		1554	}
		1555	}
1302	}	1556	}
1303		1557
1304	# TODO: move to container class maybe? send children a signal on removal?	1558	# TODO: move to container class maybe? send children a signal on removal?
1305	sub clear {	1559	sub clear {
1306	my ($self) = @_;	1560	my ($self) = @_;
…		…
1355	my ($ws, $hs) = $self->get_wh;	1609	my ($ws, $hs) = $self->get_wh;
1356		1610
1357	my $req_w = (sum @$ws) || 1;	1611	my $req_w = (sum @$ws) || 1;
1358	my $req_h = (sum @$hs) || 1;	1612	my $req_h = (sum @$hs) || 1;
1359		1613
1360	# TODO: nicer code && do row_expand	1614	# TODO: nicer code
1361	my @col_expand = @{$self->{col_expand}};	1615	my @col_expand = @{$self->{col_expand}};
1362	@col_expand = (1) x @$ws unless @col_expand;	1616	@col_expand = (1) x @$ws unless @col_expand;
1363	my $col_expand = (sum @col_expand) || 1;	1617	my $col_expand = (sum @col_expand) || 1;
1364		1618
1365	# linearly scale sizes
1366	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1619	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368		1620
1369	CFClient::UI::harmonize $ws;	1621	CFPlus::UI::harmonize $ws;
		1622
		1623	my @row_expand = @{$self->{row_expand}};
		1624	@row_expand = (1) x @$ws unless @row_expand;
		1625	my $row_expand = (sum @row_expand) || 1;
		1626
		1627	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1628
1370	CFClient::UI::harmonize $hs;	1629	CFPlus::UI::harmonize $hs;
1371		1630
1372	my $y;	1631	my $y;
1373		1632
1374	for my $r (0 .. $#{$self->{children}}) {	1633	for my $r (0 .. $#{$self->{children}}) {
1375	my $row = $self->{children}[$r]	1634	my $row = $self->{children}[$r]
…		…
1418	}	1677	}
1419	}	1678	}
1420		1679
1421	#############################################################################	1680	#############################################################################
1422		1681
1423	package CFClient::UI::Box;	1682	package CFPlus::UI::Fixed;
1424		1683
		1684	use List::Util qw(min max);
		1685
1425	our @ISA = CFClient::UI::Container::;	1686	our @ISA = CFPlus::UI::Container::;
		1687
		1688	sub add {
		1689	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1690
		1691	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1692	$self->SUPER::add ($child);
		1693	}
		1694
		1695	sub _scale($$$) {
		1696	my ($mode, $val, $max) = @_;
		1697
		1698	$mode eq "abs" ? $val
		1699	: $mode eq "rel" ? $val * $max
		1700	: 0
		1701	}
		1702
		1703	sub size_request {
		1704	my ($self) = @_;
		1705
		1706	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1707
		1708	# determine overall size by querying abs widgets
		1709	for my $child ($self->visible_children) {
		1710	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1711
		1712	if ($pos eq "abs") {
		1713	$w = _scale $size, $w, $child->{req_w};
		1714	$h = _scale $size, $h, $child->{req_h};
		1715
		1716	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1717	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1718	}
		1719	}
		1720
		1721	my $W = $x2 - $x1;
		1722	my $H = $y2 - $y1;
		1723
		1724	# now layout remaining widgets
		1725	for my $child ($self->visible_children) {
		1726	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1727
		1728	if ($pos ne "abs") {
		1729	$x = _scale $pos, $x, $W;
		1730	$y = _scale $pos, $x, $H;
		1731	$w = _scale $size, $w, $child->{req_w};
		1732	$h = _scale $size, $h, $child->{req_h};
		1733
		1734	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1735	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1736	}
		1737	}
		1738
		1739	my $W = $x2 - $x1;
		1740	my $H = $y2 - $y1;
		1741
		1742	($W, $H)
		1743	}
		1744
		1745	sub invoke_size_allocate {
		1746	my ($self, $W, $H) = @_;
		1747
		1748	for my $child ($self->visible_children) {
		1749	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1750
		1751	$x = _scale $pos, $x, $W;
		1752	$y = _scale $pos, $x, $H;
		1753	$w = _scale $size, $w, $child->{req_w};
		1754	$h = _scale $size, $h, $child->{req_h};
		1755
		1756	$child->configure ($x, $y, $w, $h);
		1757	}
		1758
		1759	1
		1760	}
		1761
		1762	#############################################################################
		1763
		1764	package CFPlus::UI::Box;
		1765
		1766	our @ISA = CFPlus::UI::Container::;
1426		1767
1427	sub size_request {	1768	sub size_request {
1428	my ($self) = @_;	1769	my ($self) = @_;
1429		1770
1430	$self->{vertical}	1771	$self->{vertical}
…		…
1463	$req[$_] += $space * $children[$_]{expand}	1804	$req[$_] += $space * $children[$_]{expand}
1464	for 0 .. $#children;	1805	for 0 .. $#children;
1465	}	1806	}
1466	}	1807	}
1467		1808
1468	CFClient::UI::harmonize \@req;	1809	CFPlus::UI::harmonize \@req;
1469		1810
1470	my $pos = 0;	1811	my $pos = 0;
1471	for (0 .. $#children) {	1812	for (0 .. $#children) {
1472	my $alloc = $req[$_];	1813	my $alloc = $req[$_];
1473	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1814	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1478	1	1819	1
1479	}	1820	}
1480		1821
1481	#############################################################################	1822	#############################################################################
1482		1823
1483	package CFClient::UI::HBox;	1824	package CFPlus::UI::HBox;
1484		1825
1485	our @ISA = CFClient::UI::Box::;	1826	our @ISA = CFPlus::UI::Box::;
1486		1827
1487	sub new {	1828	sub new {
1488	my $class = shift;	1829	my $class = shift;
1489		1830
1490	$class->SUPER::new (	1831	$class->SUPER::new (
…		…
1493	)	1834	)
1494	}	1835	}
1495		1836
1496	#############################################################################	1837	#############################################################################
1497		1838
1498	package CFClient::UI::VBox;	1839	package CFPlus::UI::VBox;
1499		1840
1500	our @ISA = CFClient::UI::Box::;	1841	our @ISA = CFPlus::UI::Box::;
1501		1842
1502	sub new {	1843	sub new {
1503	my $class = shift;	1844	my $class = shift;
1504		1845
1505	$class->SUPER::new (	1846	$class->SUPER::new (
…		…
1508	)	1849	)
1509	}	1850	}
1510		1851
1511	#############################################################################	1852	#############################################################################
1512		1853
1513	package CFClient::UI::Label;	1854	package CFPlus::UI::Label;
1514		1855
1515	our @ISA = CFClient::UI::DrawBG::;	1856	our @ISA = CFPlus::UI::DrawBG::;
1516		1857
1517	use CFClient::OpenGL;	1858	use CFPlus::OpenGL;
1518		1859
1519	sub new {	1860	sub new {
1520	my ($class, %arg) = @_;	1861	my ($class, %arg) = @_;
1521		1862
1522	my $self = $class->SUPER::new (	1863	my $self = $class->SUPER::new (
…		…
1525	#active_bg => none	1866	#active_bg => none
1526	#font => default_font	1867	#font => default_font
1527	#text => initial text	1868	#text => initial text
1528	#markup => initial narkup	1869	#markup => initial narkup
1529	#max_w => maximum pixel width	1870	#max_w => maximum pixel width
		1871	#style => 0, # render flags
1530	ellipsise => 3, # end	1872	ellipsise => 3, # end
1531	layout => (new CFClient::Layout),	1873	layout => (new CFPlus::Layout),
1532	fontsize => 1,	1874	fontsize => 1,
1533	align => -1,	1875	align => -1,
1534	valign => -1,	1876	valign => -1,
1535	padding_x => 2,	1877	padding_x => 2,
1536	padding_y => 2,	1878	padding_y => 2,
1537	can_events => 0,	1879	can_events => 0,
1538	%arg	1880	%arg
1539	);	1881	);
1540		1882
1541	if (exists $self->{template}) {	1883	if (exists $self->{template}) {
1542	my $layout = new CFClient::Layout;	1884	my $layout = new CFPlus::Layout;
1543	$layout->set_text (delete $self->{template});	1885	$layout->set_text (delete $self->{template});
1544	$self->{template} = $layout;	1886	$self->{template} = $layout;
1545	}	1887	}
1546		1888
1547	if (exists $self->{markup}) {	1889	if (exists $self->{markup}) {
…		…
1551	}	1893	}
1552		1894
1553	$self	1895	$self
1554	}	1896	}
1555		1897
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 {	1898	sub update {
1567	my ($self) = @_;	1899	my ($self) = @_;
1568		1900
1569	delete $self->{texture};	1901	delete $self->{texture};
1570	$self->SUPER::update;	1902	$self->SUPER::update;
…		…
1581	my ($self, $text) = @_;	1913	my ($self, $text) = @_;
1582		1914
1583	return if $self->{text} eq "T$text";	1915	return if $self->{text} eq "T$text";
1584	$self->{text} = "T$text";	1916	$self->{text} = "T$text";
1585		1917
1586	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587	$self->{layout}->set_text ($text);	1918	$self->{layout}->set_text ($text);
1588		1919
1589	delete $self->{size_req};	1920	delete $self->{size_req};
1590	$self->realloc;	1921	$self->realloc;
1591	$self->update;	1922	$self->update;
…		…
1597	return if $self->{text} eq "M$markup";	1928	return if $self->{text} eq "M$markup";
1598	$self->{text} = "M$markup";	1929	$self->{text} = "M$markup";
1599		1930
1600	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1931	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601		1932
1602	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603	$self->{layout}->set_markup ($markup);	1933	$self->{layout}->set_markup ($markup);
1604		1934
1605	delete $self->{size_req};	1935	delete $self->{size_req};
1606	$self->realloc;	1936	$self->realloc;
1607	$self->update;	1937	$self->update;
…		…
1619		1949
1620	my ($w, $h) = $self->{layout}->size;	1950	my ($w, $h) = $self->{layout}->size;
1621		1951
1622	if (exists $self->{template}) {	1952	if (exists $self->{template}) {
1623	$self->{template}->set_font ($self->{font}) if $self->{font};	1953	$self->{template}->set_font ($self->{font}) if $self->{font};
		1954	$self->{template}->set_width ($self->{max_w} || -1);
1624	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1955	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625		1956
1626	my ($w2, $h2) = $self->{template}->size;	1957	my ($w2, $h2) = $self->{template}->size;
1627		1958
1628	$w = List::Util::max $w, $w2;	1959	$w = List::Util::max $w, $w2;
…		…
1652		1983
1653	sub set_fontsize {	1984	sub set_fontsize {
1654	my ($self, $fontsize) = @_;	1985	my ($self, $fontsize) = @_;
1655		1986
1656	$self->{fontsize} = $fontsize;	1987	$self->{fontsize} = $fontsize;
		1988	delete $self->{size_req};
1657	delete $self->{texture};	1989	delete $self->{texture};
1658		1990
1659	$self->realloc;	1991	$self->realloc;
1660	}	1992	}
1661		1993
1662	sub reconfigure {	1994	sub reconfigure {
1663	my ($self) = @_;	1995	my ($self) = @_;
1664		1996
1665	delete $self->{size_req};	1997	delete $self->{size_req};
		1998	delete $self->{texture};
1666		1999
1667	$self->SUPER::reconfigure;	2000	$self->SUPER::reconfigure;
1668	}	2001	}
1669		2002
1670	sub _draw {	2003	sub _draw {
1671	my ($self) = @_;	2004	my ($self) = @_;
1672		2005
1673	$self->SUPER::_draw; # draw background, if applicable	2006	$self->SUPER::_draw; # draw background, if applicable
1674		2007
1675	my $tex = $self->{texture} ||= do {	2008	my $size = $self->{texture} ||= do {
1676	$self->{layout}->set_foreground (@{$self->{fg}});	2009	$self->{layout}->set_foreground (@{$self->{fg}});
1677	$self->{layout}->set_font ($self->{font}) if $self->{font};	2010	$self->{layout}->set_font ($self->{font}) if $self->{font};
1678	$self->{layout}->set_width ($self->{w});	2011	$self->{layout}->set_width ($self->{w});
1679	$self->{layout}->set_ellipsise ($self->{ellipsise});	2012	$self->{layout}->set_ellipsise ($self->{ellipsise});
1680	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2013	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2014	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682		2015
1683	new_from_layout CFClient::Texture $self->{layout}	2016	[$self->{layout}->size]
1684	};	2017	};
1685		2018
1686	unless (exists $self->{ox}) {	2019	unless (exists $self->{ox}) {
1687	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2020	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2021	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689	: ($self->{w} - $tex->{w}) * 0.5);	2022	: ($self->{w} - $size->[0]) * 0.5);
1690		2023
1691	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2024	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2025	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693	: ($self->{h} - $tex->{h}) * 0.5);	2026	: ($self->{h} - $size->[1]) * 0.5);
1694	};	2027	};
1695		2028
1696	glEnable GL_TEXTURE_2D;
1697
1698	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2029	my $w = List::Util::min $self->{w} + 4, $size->[0];
1699	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2030	my $h = List::Util::min $self->{h} + 2, $size->[1];
1700		2031
1701	if ($tex->{format} == GL_ALPHA) {	2032	$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	}	2033	}
1712		2034
1713	#############################################################################	2035	#############################################################################
1714		2036
1715	package CFClient::UI::EntryBase;	2037	package CFPlus::UI::EntryBase;
1716		2038
1717	our @ISA = CFClient::UI::Label::;	2039	our @ISA = CFPlus::UI::Label::;
1718		2040
1719	use CFClient::OpenGL;	2041	use CFPlus::OpenGL;
1720		2042
1721	sub new {	2043	sub new {
1722	my $class = shift;	2044	my $class = shift;
1723		2045
1724	$class->SUPER::new (	2046	$class->SUPER::new (
…		…
1728	active_fg => [0, 0, 0],	2050	active_fg => [0, 0, 0],
1729	can_hover => 1,	2051	can_hover => 1,
1730	can_focus => 1,	2052	can_focus => 1,
1731	valign => 0,	2053	valign => 0,
1732	can_events => 1,	2054	can_events => 1,
		2055	ellipsise => 0,
1733	#text => ...	2056	#text => ...
1734	#hidden => "*",	2057	#hidden => "*",
1735	@_	2058	@_
1736	)	2059	)
1737	}	2060	}
…		…
1782	my $sym = $ev->{sym};	2105	my $sym = $ev->{sym};
1783	my $uni = $ev->{unicode};	2106	my $uni = $ev->{unicode};
1784		2107
1785	my $text = $self->get_text;	2108	my $text = $self->get_text;
1786		2109
		2110	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2111
1787	if ($uni == 8) {	2112	if ($uni == 8) {
1788	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2113	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789	} elsif ($uni == 127) {	2114	} elsif ($uni == 127) {
1790	substr $text, $self->{cursor}, 1, "";	2115	substr $text, $self->{cursor}, 1, "";
1791	} elsif ($sym == CFClient::SDLK_LEFT) {	2116	} elsif ($sym == CFPlus::SDLK_LEFT) {
1792	--$self->{cursor} if $self->{cursor};	2117	--$self->{cursor} if $self->{cursor};
1793	} elsif ($sym == CFClient::SDLK_RIGHT) {	2118	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1794	++$self->{cursor} if $self->{cursor} < length $self->{text};	2119	++$self->{cursor} if $self->{cursor} < length $self->{text};
1795	} elsif ($sym == CFClient::SDLK_HOME) {	2120	} elsif ($sym == CFPlus::SDLK_HOME) {
		2121	# what a hack
		2122	$self->{cursor} =
		2123	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2124	? length $1
		2125	: 0;
		2126	} elsif ($sym == CFPlus::SDLK_END) {
		2127	# uh, again
		2128	$self->{cursor} =
		2129	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2130	? $self->{cursor} + length $1
		2131	: length $self->{text};
		2132	} elsif ($uni == 21) { # ctrl-u
		2133	$text = "";
1796	$self->{cursor} = 0;	2134	$self->{cursor} = 0;
1797	} elsif ($sym == CFClient::SDLK_END) {
1798	$self->{cursor} = length $text;
1799	} elsif ($uni == 27) {	2135	} elsif ($uni == 27) {
1800	$self->emit ('escape');	2136	$self->emit ('escape');
1801	} elsif ($uni) {	2137	} elsif ($uni == 0x0d) {
		2138	substr $text, $self->{cursor}++, 0, "\012";
		2139	} elsif ($uni >= 0x20) {
1802	substr $text, $self->{cursor}++, 0, chr $uni;	2140	substr $text, $self->{cursor}++, 0, chr $uni;
1803	} else {	2141	} else {
1804	return 0;	2142	return 0;
1805	}	2143	}
1806		2144
1807	$self->_set_text ($text);	2145	$self->_set_text ($text);
1808		2146
1809	$self->realloc;	2147	$self->realloc;
		2148	$self->update;
1810		2149
1811	1	2150	1
1812	}	2151	}
1813		2152
1814	sub invoke_focus_in {	2153	sub invoke_focus_in {
…		…
1826		2165
1827	my $idx = $self->{layout}->xy_to_index ($x, $y);	2166	my $idx = $self->{layout}->xy_to_index ($x, $y);
1828		2167
1829	# byte-index to char-index	2168	# byte-index to char-index
1830	my $text = $self->{text};	2169	my $text = $self->{text};
1831	utf8::encode $text;	2170	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832	$self->{cursor} = length substr $text, 0, $idx;	2171	$self->{cursor} = length $text;
1833		2172
1834	$self->_set_text ($self->{text});	2173	$self->_set_text ($self->{text});
1835	$self->update;	2174	$self->update;
1836		2175
1837	1	2176	1
…		…
1876	utf8::encode $text;	2215	utf8::encode $text;
1877		2216
1878	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2217	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879	}	2218	}
1880		2219
1881	glColor @{$self->{fg}};
1882	glBegin GL_LINES;	2220	glBegin GL_LINES;
1883	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2221	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};	2222	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885	glEnd;	2223	glEnd;
1886	}	2224	}
1887	}	2225	}
1888		2226
		2227	#############################################################################
		2228
1889	package CFClient::UI::Entry;	2229	package CFPlus::UI::Entry;
1890		2230
1891	our @ISA = CFClient::UI::EntryBase::;	2231	our @ISA = CFPlus::UI::EntryBase::;
1892		2232
1893	use CFClient::OpenGL;	2233	use CFPlus::OpenGL;
1894		2234
1895	sub invoke_key_down {	2235	sub invoke_key_down {
1896	my ($self, $ev) = @_;	2236	my ($self, $ev) = @_;
1897		2237
1898	my $sym = $ev->{sym};	2238	my $sym = $ev->{sym};
1899		2239
1900	if ($sym == 13) {	2240	if ($ev->{uni} == 0x0d || $sym == 13) {
1901	unshift @{$self->{history}},	2241	unshift @{$self->{history}},
1902	my $txt = $self->get_text;	2242	my $txt = $self->get_text;
1903		2243
1904	$self->{history_pointer} = -1;	2244	$self->{history_pointer} = -1;
1905	$self->{history_saveback} = '';	2245	$self->{history_saveback} = '';
1906	$self->emit (activate => $txt);	2246	$self->emit (activate => $txt);
1907	$self->update;	2247	$self->update;
1908		2248
1909	} elsif ($sym == CFClient::SDLK_UP) {	2249	} elsif ($sym == CFPlus::SDLK_UP) {
1910	if ($self->{history_pointer} < 0) {	2250	if ($self->{history_pointer} < 0) {
1911	$self->{history_saveback} = $self->get_text;	2251	$self->{history_saveback} = $self->get_text;
1912	}	2252	}
1913	if (@{$self->{history} || []} > 0) {	2253	if (@{$self->{history} || []} > 0) {
1914	$self->{history_pointer}++;	2254	$self->{history_pointer}++;
…		…
1916	$self->{history_pointer} = @{$self->{history} || []} - 1;	2256	$self->{history_pointer} = @{$self->{history} || []} - 1;
1917	}	2257	}
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2258	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1919	}	2259	}
1920		2260
1921	} elsif ($sym == CFClient::SDLK_DOWN) {	2261	} elsif ($sym == CFPlus::SDLK_DOWN) {
1922	$self->{history_pointer}--;	2262	$self->{history_pointer}--;
1923	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2263	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924		2264
1925	if ($self->{history_pointer} >= 0) {	2265	if ($self->{history_pointer} >= 0) {
1926	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2266	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1935	1	2275	1
1936	}	2276	}
1937		2277
1938	#############################################################################	2278	#############################################################################
1939		2279
		2280	package CFPlus::UI::TextEdit;
		2281
		2282	our @ISA = CFPlus::UI::EntryBase::;
		2283
		2284	use CFPlus::OpenGL;
		2285
		2286	sub move_cursor_ver {
		2287	my ($self, $dy) = @_;
		2288
		2289	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2290
		2291	$y += $dy;
		2292
		2293	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2294	$self->{cursor} = $index;
		2295	delete $self->{cur_h};
		2296	$self->update;
		2297	return;
		2298	}
		2299	}
		2300
		2301	sub invoke_key_down {
		2302	my ($self, $ev) = @_;
		2303
		2304	my $sym = $ev->{sym};
		2305
		2306	if ($sym == CFPlus::SDLK_UP) {
		2307	$self->move_cursor_ver (-1);
		2308	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2309	$self->move_cursor_ver (+1);
		2310	} else {
		2311	return $self->SUPER::invoke_key_down ($ev)
		2312	}
		2313
		2314	1
		2315	}
		2316
		2317	#############################################################################
		2318
1940	package CFClient::UI::Button;	2319	package CFPlus::UI::Button;
1941		2320
1942	our @ISA = CFClient::UI::Label::;	2321	our @ISA = CFPlus::UI::Label::;
1943		2322
1944	use CFClient::OpenGL;	2323	use CFPlus::OpenGL;
1945		2324
1946	my @tex =	2325	my @tex =
1947	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2326	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948	qw(b1_button_active.png);	2327	qw(b1_button_active.png);
1949		2328
1950	sub new {	2329	sub new {
1951	my $class = shift;	2330	my $class = shift;
1952		2331
…		…
1989	$self->SUPER::_draw;	2368	$self->SUPER::_draw;
1990	}	2369	}
1991		2370
1992	#############################################################################	2371	#############################################################################
1993		2372
		2373	package CFPlus::UI::CheckBox;
		2374
		2375	our @ISA = CFPlus::UI::DrawBG::;
		2376
		2377	my @tex =
		2378	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2379	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2380
		2381	use CFPlus::OpenGL;
		2382
		2383	sub new {
		2384	my $class = shift;
		2385
		2386	$class->SUPER::new (
		2387	padding_x => 2,
		2388	padding_y => 2,
		2389	fg => [1, 1, 1],
		2390	active_fg => [1, 1, 0],
		2391	bg => [0, 0, 0, 0.2],
		2392	active_bg => [1, 1, 1, 0.5],
		2393	state => 0,
		2394	can_hover => 1,
		2395	@_
		2396	)
		2397	}
		2398
		2399	sub size_request {
		2400	my ($self) = @_;
		2401
		2402	(6) x 2
		2403	}
		2404
		2405	sub toggle {
		2406	my ($self) = @_;
		2407
		2408	$self->{state} = !$self->{state};
		2409	$self->emit (changed => $self->{state});
		2410	$self->update;
		2411	}
		2412
		2413	sub invoke_button_down {
		2414	my ($self, $ev, $x, $y) = @_;
		2415
		2416	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2417	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2418	$self->toggle;
		2419	} else {
		2420	return 0
		2421	}
		2422
		2423	1
		2424	}
		2425
		2426	sub _draw {
		2427	my ($self) = @_;
		2428
		2429	$self->SUPER::_draw;
		2430
		2431	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2432
		2433	my ($w, $h) = @$self{qw(w h)};
		2434
		2435	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2436
		2437	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2438
		2439	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2440
		2441	glEnable GL_TEXTURE_2D;
		2442	$tex->draw_quad_alpha (0, 0, $s, $s);
		2443	glDisable GL_TEXTURE_2D;
		2444	}
		2445
		2446	#############################################################################
		2447
		2448	package CFPlus::UI::Image;
		2449
		2450	our @ISA = CFPlus::UI::Base::;
		2451
		2452	use CFPlus::OpenGL;
		2453
		2454	our %texture_cache;
		2455
		2456	sub new {
		2457	my $class = shift;
		2458
		2459	my $self = $class->SUPER::new (
		2460	can_events => 0,
		2461	@_,
		2462	);
		2463
		2464	$self->{path} || $self->{tex}
		2465	or Carp::croak "'path' or 'tex' attributes required";
		2466
		2467	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2468	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2469
		2470	CFPlus::weaken $texture_cache{$self->{path}};
		2471
		2472	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2473
		2474	$self
		2475	}
		2476
		2477	sub STORABLE_freeze {
		2478	my ($self, $cloning) = @_;
		2479
		2480	$self->{path}
		2481	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2482
		2483	$self->{path}
		2484	}
		2485
		2486	sub STORABLE_attach {
		2487	my ($self, $cloning, $path) = @_;
		2488
		2489	$self->new (path => $path)
		2490	}
		2491
		2492	sub size_request {
		2493	my ($self) = @_;
		2494
		2495	($self->{tex}{w}, $self->{tex}{h})
		2496	}
		2497
		2498	sub _draw {
		2499	my ($self) = @_;
		2500
		2501	my $tex = $self->{tex};
		2502
		2503	my ($w, $h) = ($self->{w}, $self->{h});
		2504
		2505	if ($self->{rot90}) {
		2506	glRotate 90, 0, 0, 1;
		2507	glTranslate 0, -$self->{w}, 0;
		2508
		2509	($w, $h) = ($h, $w);
		2510	}
		2511
		2512	glEnable GL_TEXTURE_2D;
		2513	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2514
		2515	$tex->draw_quad (0, 0, $w, $h);
		2516
		2517	glDisable GL_TEXTURE_2D;
		2518	}
		2519
		2520	#############################################################################
		2521
1994	package CFClient::UI::ImageButton;	2522	package CFPlus::UI::ImageButton;
1995		2523
1996	our @ISA = CFClient::UI::Image::;	2524	our @ISA = CFPlus::UI::Image::;
1997		2525
1998	use CFClient::OpenGL;	2526	use CFPlus::OpenGL;
1999		2527
2000	my %textures;	2528	my %textures;
2001		2529
2002	sub new {	2530	sub new {
2003	my $class = shift;	2531	my $class = shift;
…		…
2025	1	2553	1
2026	}	2554	}
2027		2555
2028	#############################################################################	2556	#############################################################################
2029		2557
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;	2558	package CFPlus::UI::VGauge;
2099		2559
2100	our @ISA = CFClient::UI::Base::;	2560	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		2561
2161	use List::Util qw(min max);	2562	use List::Util qw(min max);
2162		2563
2163	use CFClient::OpenGL;	2564	use CFPlus::OpenGL;
2164		2565
2165	my %tex = (	2566	my %tex = (
2166	food => [	2567	food => [
2167	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2568	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2569	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169	],	2570	],
2170	grace => [	2571	grace => [
2171	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2572	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/	2573	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2173	],	2574	],
2174	hp => [	2575	hp => [
2175	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2576	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2577	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177	],	2578	],
2178	mana => [	2579	mana => [
2179	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2580	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/	2581	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2181	],	2582	],
2182	);	2583	);
2183		2584
2184	# eg. VGauge->new (gauge => 'food'), default gauge: food	2585	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2244	my $ycut1 = max 0, min 1, $ycut;	2645	my $ycut1 = max 0, min 1, $ycut;
2245	my $ycut2 = max 0, min 1, $ycut - 1;	2646	my $ycut2 = max 0, min 1, $ycut - 1;
2246		2647
2247	my $h1 = $self->{h} * (1 - $ycut1);	2648	my $h1 = $self->{h} * (1 - $ycut1);
2248	my $h2 = $self->{h} * (1 - $ycut2);	2649	my $h2 = $self->{h} * (1 - $ycut2);
		2650	my $h3 = $self->{h};
		2651
		2652	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249		2653
2250	glEnable GL_BLEND;	2654	glEnable GL_BLEND;
2251	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2655	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2656	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253	glEnable GL_TEXTURE_2D;	2657	glEnable GL_TEXTURE_2D;
…		…
2272		2676
2273	if ($t3) {	2677	if ($t3) {
2274	glBindTexture GL_TEXTURE_2D, $t3->{name};	2678	glBindTexture GL_TEXTURE_2D, $t3->{name};
2275	glBegin GL_QUADS;	2679	glBegin GL_QUADS;
2276	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2680	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2681	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2682	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2683	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280	glEnd;	2684	glEnd;
2281	}	2685	}
2282		2686
2283	glDisable GL_BLEND;	2687	glDisable GL_BLEND;
2284	glDisable GL_TEXTURE_2D;	2688	glDisable GL_TEXTURE_2D;
2285	}	2689	}
2286		2690
2287	#############################################################################	2691	#############################################################################
2288		2692
2289	package CFClient::UI::Gauge;	2693	package CFPlus::UI::Gauge;
2290		2694
2291	our @ISA = CFClient::UI::VBox::;	2695	our @ISA = CFPlus::UI::VBox::;
2292		2696
2293	sub new {	2697	sub new {
2294	my ($class, %arg) = @_;	2698	my ($class, %arg) = @_;
2295		2699
2296	my $self = $class->SUPER::new (	2700	my $self = $class->SUPER::new (
…		…
2298	can_hover => 1,	2702	can_hover => 1,
2299	can_events => 1,	2703	can_events => 1,
2300	%arg,	2704	%arg,
2301	);	2705	);
2302		2706
2303	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2707	$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);	2708	$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");	2709	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306		2710
2307	$self	2711	$self
2308	}	2712	}
2309		2713
2310	sub set_fontsize {	2714	sub set_fontsize {
…		…
2331	$self->{value}->set_text ($val);	2735	$self->{value}->set_text ($val);
2332	}	2736	}
2333		2737
2334	#############################################################################	2738	#############################################################################
2335		2739
2336	package CFClient::UI::Slider;	2740	package CFPlus::UI::Slider;
2337		2741
2338	use strict;	2742	use strict;
2339		2743
2340	use CFClient::OpenGL;	2744	use CFPlus::OpenGL;
2341		2745
2342	our @ISA = CFClient::UI::DrawBG::;	2746	our @ISA = CFPlus::UI::DrawBG::;
2343		2747
2344	my @tex =	2748	my @tex =
2345	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2749	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346	qw(s1_slider.png s1_slider_bg.png);	2750	qw(s1_slider.png s1_slider_bg.png);
2347		2751
2348	sub new {	2752	sub new {
2349	my $class = shift;	2753	my $class = shift;
2350		2754
…		…
2439	}	2843	}
2440		2844
2441	1	2845	1
2442	}	2846	}
2443		2847
		2848	sub invoke_mouse_wheel {
		2849	my ($self, $ev) = @_;
		2850
		2851	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2852
		2853	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2854
		2855	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2856
		2857	! ! $delta
		2858	}
		2859
2444	sub update {	2860	sub update {
2445	my ($self) = @_;	2861	my ($self) = @_;
2446		2862
2447	delete $self->{knob_w};	2863	delete $self->{knob_w};
2448	$self->SUPER::update;	2864	$self->SUPER::update;
…		…
2495	glDisable GL_TEXTURE_2D;	2911	glDisable GL_TEXTURE_2D;
2496	}	2912	}
2497		2913
2498	#############################################################################	2914	#############################################################################
2499		2915
2500	package CFClient::UI::ValSlider;	2916	package CFPlus::UI::ValSlider;
2501		2917
2502	our @ISA = CFClient::UI::HBox::;	2918	our @ISA = CFPlus::UI::HBox::;
2503		2919
2504	sub new {	2920	sub new {
2505	my ($class, %arg) = @_;	2921	my ($class, %arg) = @_;
2506		2922
2507	my $range = delete $arg{range};	2923	my $range = delete $arg{range};
2508		2924
2509	my $self = $class->SUPER::new (	2925	my $self = $class->SUPER::new (
2510	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2926	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2927	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512	to_value => sub { shift },	2928	to_value => sub { shift },
2513	from_value => sub { shift },	2929	from_value => sub { shift },
2514	%arg,	2930	%arg,
2515	);	2931	);
2516		2932
…		…
2536	sub set_range { shift->{slider}->set_range (@_) }	2952	sub set_range { shift->{slider}->set_range (@_) }
2537	sub set_value { shift->{slider}->set_value (@_) }	2953	sub set_value { shift->{slider}->set_value (@_) }
2538		2954
2539	#############################################################################	2955	#############################################################################
2540		2956
2541	package CFClient::UI::TextScroller;	2957	package CFPlus::UI::TextScroller;
2542		2958
2543	our @ISA = CFClient::UI::HBox::;	2959	our @ISA = CFPlus::UI::HBox::;
2544		2960
2545	use CFClient::OpenGL;	2961	use CFPlus::OpenGL;
2546		2962
2547	sub new {	2963	sub new {
2548	my $class = shift;	2964	my $class = shift;
2549		2965
2550	my $self = $class->SUPER::new (	2966	my $self = $class->SUPER::new (
2551	fontsize => 1,	2967	fontsize => 1,
2552	can_events => 0,	2968	can_events => 1,
2553	indent => 0,	2969	indent => 0,
2554	#font => default_font	2970	#font => default_font
2555	@_,	2971	@_,
2556		2972
2557	layout => (new CFClient::Layout 1),	2973	layout => (new CFPlus::Layout),
2558	par => [],	2974	par => [],
		2975	max_par => 0,
2559	height => 0,	2976	height => 0,
2560	children => [	2977	children => [
2561	(new CFClient::UI::Empty expand => 1),	2978	(new CFPlus::UI::Empty expand => 1),
2562	(new CFClient::UI::Slider vertical => 1),	2979	(new CFPlus::UI::Slider vertical => 1),
2563	],	2980	],
2564	);	2981	);
2565		2982
2566	$self->{children}[1]->connect (changed => sub { $self->update });	2983	$self->{children}[1]->connect (changed => sub { $self->update });
2567		2984
…		…
2597		3014
2598	$self->reflow;	3015	$self->reflow;
2599		3016
2600	local $self->{children} = [$empty, $slider];	3017	local $self->{children} = [$empty, $slider];
2601	$self->SUPER::invoke_size_allocate ($w, $h)	3018	$self->SUPER::invoke_size_allocate ($w, $h)
		3019	}
		3020
		3021	sub invoke_mouse_wheel {
		3022	my ($self, $ev) = @_;
		3023
		3024	return 0 unless $ev->{dy}; # only vertical movements
		3025
		3026	$self->{children}[1]->emit (mouse_wheel => $ev);
		3027
		3028	1
2602	}	3029	}
2603		3030
2604	sub get_layout {	3031	sub get_layout {
2605	my ($self, $para) = @_;	3032	my ($self, $para) = @_;
2606		3033
…		…
2634		3061
2635	# todo: base offset on lines or so, not on pixels	3062	# todo: base offset on lines or so, not on pixels
2636	$self->{children}[1]->set_value ($offset);	3063	$self->{children}[1]->set_value ($offset);
2637	}	3064	}
2638		3065
		3066	sub current_paragraph {
		3067	my ($self) = @_;
		3068
		3069	$self->{top_paragraph} - 1
		3070	}
		3071
		3072	sub scroll_to {
		3073	my ($self, $para) = @_;
		3074
		3075	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3076
		3077	$self->{scroll_to} = $para;
		3078	$self->update;
		3079	}
		3080
2639	sub clear {	3081	sub clear {
2640	my ($self) = @_;	3082	my ($self) = @_;
2641		3083
2642	my (undef, undef, @other) = @{ $self->{children} };	3084	my (undef, undef, @other) = @{ $self->{children} };
2643	$self->remove ($_) for @other;	3085	$self->remove ($_) for @other;
…		…
2646	$self->{height} = 0;	3088	$self->{height} = 0;
2647	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3089	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648	}	3090	}
2649		3091
2650	sub add_paragraph {	3092	sub add_paragraph {
2651	my ($self, $color, $para, $indent) = @_;	3093	my $self = shift;
2652		3094
2653	my ($text, @w) = ref $para ? @$para : $para;	3095	for my $para (@_) {
2654
2655	$para = {	3096	$para = {
		3097	fg => [1, 1, 1, 1],
		3098	indent => 0,
		3099	markup => "",
		3100	widget => [],
		3101	ref $para ? %$para : (markup => $para),
2656	w => 1e10,	3102	w => 1e10,
2657	wrapped => 1,	3103	wrapped => 1,
2658	fg => $color,
2659	indent => $indent,
2660	markup => $text,
2661	widget => \@w,
2662	};	3104	};
2663		3105
2664	$self->add (@w) if @w;	3106	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665	push @{$self->{par}}, $para;	3107	push @{$self->{par}}, $para;
		3108	}
		3109
		3110	if (my $max = $self->{max_par}) {
		3111	shift @{$self->{par}} while @{$self->{par}} > $max;
		3112	}
2666		3113
2667	$self->{need_reflow}++;	3114	$self->{need_reflow}++;
2668	$self->update;	3115	$self->update;
2669	}	3116	}
2670		3117
2671	sub scroll_to_bottom {	3118	sub scroll_to_bottom {
2672	my ($self) = @_;	3119	my ($self) = @_;
2673		3120
2674	$self->{scroll_to_bottom} = 1;	3121	$self->{scroll_to} = $#{$self->{par}};
2675	$self->update;	3122	$self->update;
2676	}	3123	}
2677		3124
		3125	sub force_uptodate {
		3126	my ($self) = @_;
		3127
		3128	if (delete $self->{need_reflow}) {
		3129	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3130
		3131	my $height = 0;
		3132
		3133	for my $para (@{$self->{par}}) {
		3134	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3135	my $layout = $self->get_layout ($para);
		3136	my ($w, $h) = $layout->size;
		3137
		3138	$para->{w} = $w + $para->{indent};
		3139	$para->{h} = $h;
		3140	$para->{wrapped} = $layout->has_wrapped;
		3141	}
		3142
		3143	$para->{y} = $height;
		3144	$height += $para->{h};
		3145	}
		3146
		3147	$self->{height} = $height;
		3148	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3149
		3150	delete $self->{texture};
		3151	}
		3152
		3153	if (my $paridx = delete $self->{scroll_to}) {
		3154	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3155	}
		3156	}
		3157
2678	sub update {	3158	sub update {
2679	my ($self) = @_;	3159	my ($self) = @_;
2680		3160
2681	$self->SUPER::update;	3161	$self->SUPER::update;
2682		3162
2683	return unless $self->{h} > 0;	3163	return unless $self->{h} > 0;
2684		3164
2685	delete $self->{texture};	3165	delete $self->{texture};
2686		3166
2687	$ROOT->on_post_alloc ($self => sub {	3167	$ROOT->on_post_alloc ($self => sub {
		3168	$self->force_uptodate;
		3169
2688	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3170	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689		3171
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 {	3172	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718	glClearColor 0, 0, 0, 0;	3173	glClearColor 0, 0, 0, 0;
2719	glClear GL_COLOR_BUFFER_BIT;	3174	glClear GL_COLOR_BUFFER_BIT;
2720		3175
		3176	package CFPlus::UI::Base;
		3177	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3178	(0, 0, $self->{w}, $self->{h});
		3179
		3180	my $top = int $self->{children}[1]{range}[0];
		3181
		3182	my $paridx = 0;
		3183	my $top_paragraph;
2721	my $top = int $self->{children}[1]{range}[0];	3184	my $top = int $self->{children}[1]{range}[0];
2722		3185
2723	my $y0 = $top;	3186	my $y0 = $top;
2724	my $y1 = $top + $H;	3187	my $y1 = $top + $H;
2725		3188
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}}) {	3189	for my $para (@{$self->{par}}) {
2733	my $h = $para->{h};	3190	my $h = $para->{h};
		3191	my $y = $para->{y};
2734		3192
2735	if ($y0 < $y + $h && $y < $y1) {	3193	if ($y0 < $y + $h && $y < $y1) {
2736
2737	my $layout = $self->get_layout ($para);	3194	my $layout = $self->get_layout ($para);
2738		3195
2739	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741	glRasterPos $para->{indent}, $y - $y0;	3196	$layout->render ($para->{indent}, $y - $y0);
2742	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743		3197
2744	if (my @w = @{ $para->{widget} }) {	3198	if (my @w = @{ $para->{widget} }) {
2745	my @s = $layout->get_shapes;	3199	my @s = $layout->get_shapes;
2746		3200
2747	for (@w) {	3201	for (@w) {
…		…
2753	$_->draw;	3207	$_->draw;
2754	}	3208	}
2755	}	3209	}
2756	}	3210	}
2757		3211
2758	$y += $h;	3212	$paridx++;
		3213	$top_paragraph ||= $paridx if $y >= $top;
2759	}	3214	}
2760		3215
2761	glDisable GL_BLEND;	3216	$self->{top_paragraph} = $top_paragraph;
2762	};	3217	};
2763	});	3218	});
2764	}	3219	}
2765		3220
2766	sub reconfigure {	3221	sub reconfigure {
…		…
2784	$self->{children}[1]->draw;	3239	$self->{children}[1]->draw;
2785	}	3240	}
2786		3241
2787	#############################################################################	3242	#############################################################################
2788		3243
2789	package CFClient::UI::Animator;	3244	package CFPlus::UI::Animator;
2790		3245
2791	use CFClient::OpenGL;	3246	use CFPlus::OpenGL;
2792		3247
2793	our @ISA = CFClient::UI::Bin::;	3248	our @ISA = CFPlus::UI::Bin::;
2794		3249
2795	sub moveto {	3250	sub moveto {
2796	my ($self, $x, $y) = @_;	3251	my ($self, $x, $y) = @_;
2797		3252
2798	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3253	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2826	glPopMatrix;	3281	glPopMatrix;
2827	}	3282	}
2828		3283
2829	#############################################################################	3284	#############################################################################
2830		3285
2831	package CFClient::UI::Flopper;	3286	package CFPlus::UI::Flopper;
2832		3287
2833	our @ISA = CFClient::UI::Button::;	3288	our @ISA = CFPlus::UI::Button::;
2834		3289
2835	sub new {	3290	sub new {
2836	my $class = shift;	3291	my $class = shift;
2837		3292
2838	my $self = $class->SUPER::new (	3293	my $self = $class->SUPER::new (
…		…
2850	$self->{other}->toggle_visibility;	3305	$self->{other}->toggle_visibility;
2851	}	3306	}
2852		3307
2853	#############################################################################	3308	#############################################################################
2854		3309
2855	package CFClient::UI::Tooltip;	3310	package CFPlus::UI::Tooltip;
2856		3311
2857	our @ISA = CFClient::UI::Bin::;	3312	our @ISA = CFPlus::UI::Bin::;
2858		3313
2859	use CFClient::OpenGL;	3314	use CFPlus::OpenGL;
2860		3315
2861	sub new {	3316	sub new {
2862	my $class = shift;	3317	my $class = shift;
2863		3318
2864	$class->SUPER::new (	3319	$class->SUPER::new (
…		…
2867	)	3322	)
2868	}	3323	}
2869		3324
2870	sub set_tooltip_from {	3325	sub set_tooltip_from {
2871	my ($self, $widget) = @_;	3326	my ($self, $widget) = @_;
		3327
		3328	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3329	if $widget->{tooltip} =~ /^#(.*)$/;
2872		3330
2873	my $tooltip = $widget->{tooltip};	3331	my $tooltip = $widget->{tooltip};
2874		3332
2875	if ($ENV{CFPLUS_DEBUG} & 2) {	3333	if ($ENV{CFPLUS_DEBUG} & 2) {
2876	$tooltip .= "\n\n" . (ref $widget) . "\n"	3334	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2880	}	3338	}
2881		3339
2882	$tooltip =~ s/^\n+//;	3340	$tooltip =~ s/^\n+//;
2883	$tooltip =~ s/\n+$//;	3341	$tooltip =~ s/\n+$//;
2884		3342
2885	$self->add (new CFClient::UI::Label	3343	$self->add (new CFPlus::UI::Label
2886	markup => $tooltip,	3344	markup => $tooltip,
2887	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3345	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888	fontsize => 0.8,	3346	fontsize => 0.8,
2889	fg => [0, 0, 0, 1],	3347	style => 1, # FLAG_INVERSE
2890	ellipsise => 0,	3348	ellipsise => 0,
2891	font => ($widget->{tooltip_font} || $::FONT_PROP),	3349	font => ($widget->{tooltip_font} || $::FONT_PROP),
2892	);	3350	);
2893	}	3351	}
2894		3352
…		…
2913		3371
2914	$self->{root}->on_post_alloc ("move_$self" => sub {	3372	$self->{root}->on_post_alloc ("move_$self" => sub {
2915	my $widget = $self->{owner}	3373	my $widget = $self->{owner}
2916	or return;	3374	or return;
2917		3375
		3376	if ($widget->{visible}) {
2918	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3377	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919		3378
2920	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3379	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921	if $x + $self->{w} > $self->{root}{w};	3380	if $x + $self->{w} > $self->{root}{w};
2922		3381
2923	$self->move_abs ($x, $y);	3382	$self->move_abs ($x, $y);
		3383	} else {
		3384	$self->hide;
		3385	}
2924	});	3386	});
2925	}	3387	}
2926		3388
2927	sub _draw {	3389	sub _draw {
2928	my ($self) = @_;	3390	my ($self) = @_;
…		…
2952	$self->SUPER::_draw;	3414	$self->SUPER::_draw;
2953	}	3415	}
2954		3416
2955	#############################################################################	3417	#############################################################################
2956		3418
2957	package CFClient::UI::Face;	3419	package CFPlus::UI::Face;
2958		3420
2959	our @ISA = CFClient::UI::Base::;	3421	our @ISA = CFPlus::UI::DrawBG::;
2960		3422
2961	use CFClient::OpenGL;	3423	use CFPlus::OpenGL;
2962		3424
2963	sub new {	3425	sub new {
2964	my $class = shift;	3426	my $class = shift;
2965		3427
2966	my $self = $class->SUPER::new (	3428	my $self = $class->SUPER::new (
		3429	size_w => 32,
		3430	size_h => 8,
2967	aspect => 1,	3431	aspect => 1,
2968	can_events => 0,	3432	can_events => 0,
2969	@_,	3433	@_,
2970	);	3434	);
2971		3435
2972	if ($self->{anim} && $self->{animspeed}) {	3436	if ($self->{anim} && $self->{animspeed}) {
2973	Scalar::Util::weaken (my $widget = $self);	3437	CFPlus::weaken (my $widget = $self);
2974		3438
2975	$self->{timer} = Event->timer (	3439	$self->{timer} = Event->timer (
2976	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3440	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2977	hard => 1,	3441	hard => 1,
2978	interval => $self->{animspeed},	3442	interval => $self->{animspeed},
2979	cb => sub {	3443	cb => sub {
		3444	return unless $::CONN;
		3445
2980	++$widget->{frame};	3446	++$widget->{frame};
		3447	$self->update_face;
2981	$widget->update;	3448	$self->update;
2982	},	3449	},
2983	);	3450	);
		3451
		3452	$self->update_face;
2984	}	3453	}
2985		3454
2986	$self	3455	$self
2987	}	3456	}
2988		3457
		3458	sub update_face {
		3459	my ($self) = @_;
		3460
		3461	return unless $::CONN;
		3462
		3463	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3464	if ($anim && @$anim) {
		3465	delete $self->{wait_face};
		3466	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3467	}
		3468	}
		3469	}
		3470
2989	sub size_request {	3471	sub size_request {
2990	(32, 8)	3472	my ($self) = @_;
		3473
		3474	if ($::CONN) {
		3475	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3476	if (my $tex = $::CONN->{texture}[$faceid]) {
		3477	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3478	} else {
		3479	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3480	$self->realloc;
		3481	});
		3482	}
		3483	}
		3484	}
		3485
		3486	($self->{size_w} || 8, $self->{size_h} || 8)
2991	}	3487	}
2992		3488
2993	sub update {	3489	sub update {
2994	my ($self) = @_;	3490	my ($self) = @_;
2995		3491
…		…
3001	sub _draw {	3497	sub _draw {
3002	my ($self) = @_;	3498	my ($self) = @_;
3003		3499
3004	return unless $::CONN;	3500	return unless $::CONN;
3005		3501
3006	my $face;	3502	$self->SUPER::_draw;
3007		3503
3008	if ($self->{frame}) {
3009	my $anim = $::CONN->{anim}[$self->{anim}];	3504	my $faceid = $::CONN->{faceid}[$self->{face}]
3010		3505	or return;
3011	$face = $anim->[ $self->{frame} % @$anim ]
3012	if $anim && @$anim;
3013	}
3014		3506
3015	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3507	my $tex = $::CONN->{texture}[$faceid];
3016		3508
3017	if ($tex) {	3509	if ($tex) {
3018	glEnable GL_TEXTURE_2D;	3510	glEnable GL_TEXTURE_2D;
3019	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3511	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3020	glColor 0, 0, 0, 1;	3512	glColor 0, 0, 0, 1;
…		…
3032	$self->SUPER::destroy;	3524	$self->SUPER::destroy;
3033	}	3525	}
3034		3526
3035	#############################################################################	3527	#############################################################################
3036		3528
3037	package CFClient::UI::Buttonbar;	3529	package CFPlus::UI::Buttonbar;
3038		3530
3039	our @ISA = CFClient::UI::HBox::;	3531	our @ISA = CFPlus::UI::HBox::;
3040		3532
3041	# TODO: should actualyl wrap buttons and other goodies.	3533	# TODO: should actually wrap buttons and other goodies.
3042		3534
3043	#############################################################################	3535	#############################################################################
3044		3536
3045	package CFClient::UI::Menu;	3537	package CFPlus::UI::Menu;
3046		3538
3047	our @ISA = CFClient::UI::FancyFrame::;	3539	our @ISA = CFPlus::UI::Toplevel::;
3048		3540
3049	use CFClient::OpenGL;	3541	use CFPlus::OpenGL;
3050		3542
3051	sub new {	3543	sub new {
3052	my $class = shift;	3544	my $class = shift;
3053		3545
3054	my $self = $class->SUPER::new (	3546	my $self = $class->SUPER::new (
3055	items => [],	3547	items => [],
3056	z => 100,	3548	z => 100,
3057	@_,	3549	@_,
3058	);	3550	);
3059		3551
3060	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3552	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061		3553
3062	for my $item (@{ $self->{items} }) {	3554	for my $item (@{ $self->{items} }) {
3063	my ($widget, $cb, $tooltip) = @$item;	3555	my ($widget, $cb, $tooltip) = @$item;
3064		3556
3065	# handle various types of items, only text for now	3557	# handle various types of items, only text for now
3066	if (!ref $widget) {	3558	if (!ref $widget) {
		3559	if ($widget =~ /\t/) {
		3560	my ($left, $right) = split /\t/, $widget, 2;
		3561
3067	$widget = new CFClient::UI::Label	3562	$widget = new CFPlus::UI::HBox
3068	can_hover => 1,	3563	can_hover => 1,
3069	can_events => 1,	3564	can_events => 1,
		3565	tooltip => $tooltip,
		3566	children => [
		3567	(new CFPlus::UI::Label markup => $left, expand => 1),
		3568	(new CFPlus::UI::Label markup => $right, align => +1),
		3569	],
		3570	;
		3571
		3572	} else {
		3573	$widget = new CFPlus::UI::Label
		3574	can_hover => 1,
		3575	can_events => 1,
3070	markup => $widget,	3576	markup => $widget,
3071	tooltip => $tooltip	3577	tooltip => $tooltip;
		3578	}
3072	}	3579	}
3073		3580
3074	$self->{item}{$widget} = $item;	3581	$self->{item}{$widget} = $item;
3075		3582
3076	$self->{vbox}->add ($widget);	3583	$self->{vbox}->add ($widget);
…		…
3119	1	3626	1
3120	}	3627	}
3121		3628
3122	#############################################################################	3629	#############################################################################
3123		3630
3124	package CFClient::UI::Multiplexer;	3631	package CFPlus::UI::Multiplexer;
3125		3632
3126	our @ISA = CFClient::UI::Container::;	3633	our @ISA = CFPlus::UI::Container::;
3127		3634
3128	sub new {	3635	sub new {
3129	my $class = shift;	3636	my $class = shift;
3130		3637
3131	my $self = $class->SUPER::new (	3638	my $self = $class->SUPER::new (
…		…
3145		3652
3146	$self->{current} = $self->{children}[0]	3653	$self->{current} = $self->{children}[0]
3147	if @{ $self->{children} };	3654	if @{ $self->{children} };
3148	}	3655	}
3149		3656
		3657	sub get_current_page {
		3658	my ($self) = @_;
		3659
		3660	$self->{current}
		3661	}
		3662
3150	sub set_current_page {	3663	sub set_current_page {
3151	my ($self, $page_or_widget) = @_;	3664	my ($self, $page_or_widget) = @_;
3152		3665
3153	my $widget = ref $page_or_widget	3666	my $widget = ref $page_or_widget
3154	? $page_or_widget	3667	? $page_or_widget
…		…
3186	$self->{current}->draw;	3699	$self->{current}->draw;
3187	}	3700	}
3188		3701
3189	#############################################################################	3702	#############################################################################
3190		3703
3191	package CFClient::UI::Notebook;	3704	package CFPlus::UI::Notebook;
3192		3705
3193	our @ISA = CFClient::UI::VBox::;	3706	our @ISA = CFPlus::UI::VBox::;
3194		3707
3195	sub new {	3708	sub new {
3196	my $class = shift;	3709	my $class = shift;
3197		3710
3198	my $self = $class->SUPER::new (	3711	my $self = $class->SUPER::new (
3199	buttonbar => (new CFClient::UI::Buttonbar),	3712	buttonbar => (new CFPlus::UI::Buttonbar),
3200	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3713	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3201	# filter => # will be put between multiplexer and $self	3714	# filter => # will be put between multiplexer and $self
3202	@_,	3715	@_,
3203	);	3716	);
3204		3717
3205	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3718	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3209	}	3722	}
3210		3723
3211	sub add {	3724	sub add {
3212	my ($self, $title, $widget, $tooltip) = @_;	3725	my ($self, $title, $widget, $tooltip) = @_;
3213		3726
3214	Scalar::Util::weaken $self;	3727	CFPlus::weaken $self;
3215		3728
3216	$self->{buttonbar}->add (new CFClient::UI::Button	3729	$self->{buttonbar}->add (new CFPlus::UI::Button
3217	markup => $title,	3730	markup => $title,
3218	tooltip => $tooltip,	3731	tooltip => $tooltip,
3219	on_activate => sub { $self->set_current_page ($widget) },	3732	on_activate => sub { $self->set_current_page ($widget) },
3220	);	3733	);
3221		3734
3222	$self->{multiplexer}->add ($widget);	3735	$self->{multiplexer}->add ($widget);
3223	}	3736	}
3224		3737
		3738	sub get_current_page {
		3739	my ($self) = @_;
		3740
		3741	$self->{multiplexer}->get_current_page
		3742	}
		3743
3225	sub set_current_page {	3744	sub set_current_page {
3226	my ($self, $page) = @_;	3745	my ($self, $page) = @_;
3227		3746
3228	$self->{multiplexer}->set_current_page ($page);	3747	$self->{multiplexer}->set_current_page ($page);
3229	$self->emit (page_changed => $self->{multiplexer}{current});	3748	$self->emit (page_changed => $self->{multiplexer}{current});
3230	}	3749	}
3231		3750
3232	#############################################################################	3751	#############################################################################
3233		3752
3234	package CFClient::UI::Combobox;	3753	package CFPlus::UI::Selector;
3235		3754
3236	use utf8;	3755	use utf8;
3237		3756
3238	our @ISA = CFClient::UI::Button::;	3757	our @ISA = CFPlus::UI::Button::;
3239		3758
3240	sub new {	3759	sub new {
3241	my $class = shift;	3760	my $class = shift;
3242		3761
3243	my $self = $class->SUPER::new (	3762	my $self = $class->SUPER::new (
…		…
3260	my ($value, $title, $tooltip) = @$_;	3779	my ($value, $title, $tooltip) = @$_;
3261		3780
3262	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3781	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263	}	3782	}
3264		3783
3265	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3784	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266	}	3785	}
3267		3786
3268	sub _set_value {	3787	sub _set_value {
3269	my ($self, $value) = @_;	3788	my ($self, $value) = @_;
3270		3789
…		…
3285	$self->emit (changed => $value);	3804	$self->emit (changed => $value);
3286	}	3805	}
3287		3806
3288	#############################################################################	3807	#############################################################################
3289		3808
3290	package CFClient::UI::Statusbox;	3809	package CFPlus::UI::Statusbox;
3291		3810
3292	our @ISA = CFClient::UI::VBox::;	3811	our @ISA = CFPlus::UI::VBox::;
3293		3812
3294	sub new {	3813	sub new {
3295	my $class = shift;	3814	my $class = shift;
3296		3815
3297	my $self = $class->SUPER::new (	3816	my $self = $class->SUPER::new (
3298	fontsize => 0.8,	3817	fontsize => 0.8,
3299	@_,	3818	@_,
3300	);	3819	);
3301		3820
3302	Scalar::Util::weaken (my $this = $self);	3821	CFPlus::weaken (my $this = $self);
3303		3822
3304	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3823	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305		3824
3306	$self	3825	$self
3307	}	3826	}
…		…
3309	sub reorder {	3828	sub reorder {
3310	my ($self) = @_;	3829	my ($self) = @_;
3311	my $NOW = Time::HiRes::time;	3830	my $NOW = Time::HiRes::time;
3312		3831
3313	# freeze display when hovering over any label	3832	# freeze display when hovering over any label
3314	return if $CFClient::UI::TOOLTIP->{owner}	3833	return if $CFPlus::UI::TOOLTIP->{owner}
3315	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3834	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3316	values %{ $self->{item} };	3835	values %{ $self->{item} };
3317		3836
3318	while (my ($k, $v) = each %{ $self->{item} }) {	3837	while (my ($k, $v) = each %{ $self->{item} }) {
3319	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3838	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3320	}	3839	}
…		…
3341	for ($short) {	3860	for ($short) {
3342	s/^\s+//;	3861	s/^\s+//;
3343	s/\s+/ /g;	3862	s/\s+/ /g;
3344	}	3863	}
3345		3864
3346	new CFClient::UI::Label	3865	new CFPlus::UI::Label
3347	markup => $short,	3866	markup => $short,
3348	tooltip => $item->{tooltip},	3867	tooltip => $item->{tooltip},
3349	tooltip_font => $::FONT_PROP,	3868	tooltip_font => $::FONT_PROP,
3350	tooltip_width => 0.67,	3869	tooltip_width => 0.67,
3351	fontsize => $item->{fontsize} || $self->{fontsize},	3870	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3405	count => 1,	3924	count => 1,
3406	%arg,	3925	%arg,
3407	};	3926	};
3408	}	3927	}
3409		3928
		3929	$ROOT->on_refresh (reorder => sub {
3410	$self->reorder;	3930	$self->reorder;
		3931	});
3411	}	3932	}
3412		3933
3413	sub reconfigure {	3934	sub reconfigure {
3414	my ($self) = @_;	3935	my ($self) = @_;
3415		3936
…		…
3428	$self->SUPER::destroy;	3949	$self->SUPER::destroy;
3429	}	3950	}
3430		3951
3431	#############################################################################	3952	#############################################################################
3432		3953
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;	3954	package CFPlus::UI::Root;
3806		3955
3807	our @ISA = CFClient::UI::Container::;	3956	our @ISA = CFPlus::UI::Container::;
3808		3957
3809	use List::Util qw(min max);	3958	use List::Util qw(min max);
3810		3959
3811	use CFClient::OpenGL;	3960	use CFPlus::OpenGL;
3812		3961
3813	sub new {	3962	sub new {
3814	my $class = shift;	3963	my $class = shift;
3815		3964
3816	my $self = $class->SUPER::new (	3965	my $self = $class->SUPER::new (
3817	visible => 1,	3966	visible => 1,
3818	@_,	3967	@_,
3819	);	3968	);
3820		3969
3821	Scalar::Util::weaken ($self->{root} = $self);	3970	CFPlus::weaken ($self->{root} = $self);
3822		3971
3823	$self	3972	$self
3824	}	3973	}
3825		3974
3826	sub size_request {	3975	sub size_request {
…		…
3992	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4141	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3993		4142
3994	$w = 0 if $w < 0;	4143	$w = 0 if $w < 0;
3995	$h = 0 if $h < 0;	4144	$h = 0 if $h < 0;
3996		4145
		4146	$w = max $widget->{min_w}, $w;
		4147	$h = max $widget->{min_h}, $h;
		4148
		4149	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4150	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4151
		4152	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4153	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4154
3997	$w = int $w + 0.5;	4155	$w = int $w + 0.5;
3998	$h = int $h + 0.5;	4156	$h = int $h + 0.5;
3999		4157
4000	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4158	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001	$widget->{old_w} = $widget->{w};	4159	$widget->{old_w} = $widget->{w};
…		…
4024	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4182	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4025	glMatrixMode GL_MODELVIEW;	4183	glMatrixMode GL_MODELVIEW;
4026	glLoadIdentity;	4184	glLoadIdentity;
4027		4185
4028	{	4186	{
4029	package CFClient::UI::Base;	4187	package CFPlus::UI::Base;
4030		4188
4031	($draw_x, $draw_y, $draw_w, $draw_h) =	4189	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4032	(0, 0, $self->{w}, $self->{h});	4190	(0, 0, $self->{w}, $self->{h});
4033	}
4034		4191
4035	$self->_draw;	4192	$self->_draw;
		4193	}
4036	}	4194	}
4037		4195
4038	#############################################################################	4196	#############################################################################
4039		4197
4040	package CFClient::UI;	4198	package CFPlus::UI;
4041		4199
4042	$ROOT = new CFClient::UI::Root;	4200	$ROOT = new CFPlus::UI::Root;
4043	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4201	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4044		4202
4045	1	4203	1
4046		4204

Diff Legend

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