ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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