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.396 by root, Sat Jul 21 14:00:02 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	if $ev->{dy};
		1163
		1164	$self->{hslider}->emit (mouse_wheel => $ev)
		1165	if $ev->{dx};
		1166
		1167	1
		1168	}
		1169
		1170	sub invoke_button_down {
		1171	my ($self, $ev, $x, $y) = @_;
		1172
		1173	if ($ev->{button} == 2) {
		1174	$self->start_dragging ($ev);
		1175
		1176	return 1;
		1177	}
		1178
		1179	0
		1180	}
		1181
		1182	sub invoke_button_up {
		1183	my ($self, $ev, $x, $y) = @_;
		1184
		1185	if (delete $self->{motion}) {
		1186	return 1;
		1187	}
		1188
		1189	0
		1190	}
		1191
		1192	sub invoke_mouse_motion {
		1193	my ($self, $ev, $x, $y) = @_;
		1194
		1195	if ($self->{motion}) {
		1196	$self->{motion}->($ev, $x, $y);
		1197	return 1;
		1198	}
		1199
		1200	0
1011	}	1201	}
1012		1202
1013	sub invoke_size_allocate {	1203	sub invoke_size_allocate {
1014	my ($self, $w, $h) = @_;	1204	my ($self, $w, $h) = @_;
1015		1205
1016	$self->update_slider;	1206	$self->update_slider;
1017
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1207	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1208	}
1020		1209
1021	#############################################################################	1210	#############################################################################
1022		1211
1023	package CFClient::UI::Frame;	1212	package CFPlus::UI::Frame;
1024		1213
1025	our @ISA = CFClient::UI::Bin::;	1214	our @ISA = CFPlus::UI::Bin::;
1026		1215
1027	use CFClient::OpenGL;	1216	use CFPlus::OpenGL;
1028		1217
1029	sub new {	1218	sub new {
1030	my $class = shift;	1219	my $class = shift;
1031		1220
1032	$class->SUPER::new (	1221	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1247	$self->SUPER::_draw;
1059	}	1248	}
1060		1249
1061	#############################################################################	1250	#############################################################################
1062		1251
1063	package CFClient::UI::FancyFrame;	1252	package CFPlus::UI::FancyFrame;
1064		1253
1065	our @ISA = CFClient::UI::Bin::;	1254	our @ISA = CFPlus::UI::Bin::;
1066		1255
1067	use CFClient::OpenGL;	1256	use CFPlus::OpenGL;
		1257
		1258	sub new {
		1259	my ($class, %arg) = @_;
		1260
		1261	if ((exists $arg{label}) && !ref $arg{label}) {
		1262	$arg{label} = new CFPlus::UI::Label
		1263	align => 1,
		1264	valign => 0,
		1265	text => $arg{label},
		1266	fontsize => ($arg{border} || 0.8) * 0.75;
		1267	}
		1268
		1269	my $self = $class->SUPER::new (
		1270	# label => "",
		1271	fg => [0.6, 0.3, 0.1],
		1272	border => 0.8,
		1273	style => 'single',
		1274	%arg,
		1275	);
		1276
		1277	$self
		1278	}
		1279
		1280	sub add {
		1281	my ($self, @widgets) = @_;
		1282
		1283	$self->SUPER::add (@widgets);
		1284	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1285	}
		1286
		1287	sub border {
		1288	int $_[0]{border} * $::FONTSIZE
		1289	}
		1290
		1291	sub size_request {
		1292	my ($self) = @_;
		1293
		1294	($self->{label_w}, undef) = $self->{label}->size_request
		1295	if $self->{label};
		1296
		1297	my ($w, $h) = $self->SUPER::size_request;
		1298
		1299	(
		1300	$w + $self->border * 2,
		1301	$h + $self->border * 2,
		1302	)
		1303	}
		1304
		1305	sub invoke_size_allocate {
		1306	my ($self, $w, $h) = @_;
		1307
		1308	my $border = $self->border;
		1309
		1310	$w -= List::Util::max 0, $border * 2;
		1311	$h -= List::Util::max 0, $border * 2;
		1312
		1313	if (my $label = $self->{label}) {
		1314	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1315	$label->{h} = List::Util::min $h, $border;
		1316	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1317	}
		1318
		1319	$self->child->configure ($border, $border, $w, $h);
		1320
		1321	1
		1322	}
		1323
		1324	sub _draw {
		1325	my ($self) = @_;
		1326
		1327	my $child = $self->{children}[0];
		1328
		1329	my $border = $self->border;
		1330	my ($w, $h) = ($self->{w}, $self->{h});
		1331
		1332	$child->draw;
		1333
		1334	glColor @{$self->{fg}};
		1335	glBegin GL_LINE_STRIP;
		1336	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1337	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1338	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1339	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1340	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1341	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1342	glEnd;
		1343
		1344	if ($self->{label}) {
		1345	glTranslate $border * 2, 0;
		1346	$self->{label}->_draw;
		1347	}
		1348	}
		1349
		1350	#############################################################################
		1351
		1352	package CFPlus::UI::Toplevel;
		1353
		1354	our @ISA = CFPlus::UI::Bin::;
		1355
		1356	use CFPlus::OpenGL;
1068		1357
1069	my $bg =	1358	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1359	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1360	mipmap => 1, wrap => 1;
1072		1361
1073	my @border =	1362	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1363	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);	1364	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1365
		1366	my @icon =
		1367	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1368	qw(x1_move.png x1_resize.png);
1076		1369
1077	sub new {	1370	sub new {
1078	my ($class, %arg) = @_;	1371	my ($class, %arg) = @_;
1079		1372
1080	my $self = $class->SUPER::new (	1373	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1374	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1375	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1376	border => 0.6,
1084	can_events => 1,	1377	can_events => 1,
1085	min_w => 16,	1378	min_w => 64,
1086	min_h => 16,	1379	min_h => 32,
1087	%arg,	1380	%arg,
1088	);	1381	);
1089		1382
1090	$self->{title_widget} = new CFClient::UI::Label	1383	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1384	align => 0,
1092	valign => 1,	1385	valign => 1,
1093	text => $self->{title},	1386	text => $self->{title},
1094	fontsize => $self->{border},	1387	fontsize => $self->{border},
1095	if exists $self->{title};	1388	if exists $self->{title};
1096		1389
1097	if ($self->{has_close_button}) {	1390	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1391	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1392	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1393	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1394	on_activate => sub { $self->emit ("delete") };
1102		1395
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1396	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1397	}
1105		1398
1106	$self	1399	$self
1107	}	1400	}
1108		1401
1109	sub add {	1402	sub add {
1110	my ($self, @widgets) = @_;	1403	my ($self, @widgets) = @_;
1111		1404
1112	$self->SUPER::add (@widgets);	1405	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1406	$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};	1407	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1408	}
1116		1409
1117	sub border {	1410	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1411	int $_[0]{border} * $::FONTSIZE
1119	}	1412	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1445	$self->child->configure ($border, $border, $w, $h);
1153		1446
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1447	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1448	if $self->{close_button};
1156		1449
		1450	1
		1451	}
		1452
		1453	sub invoke_delete {
		1454	my ($self) = @_;
		1455
		1456	$self->hide;
		1457
1157	1	1458	1
1158	}	1459	}
1159		1460
1160	sub invoke_button_down {	1461	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1462	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1520	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1521
1221	! ! $self->{motion}	1522	! ! $self->{motion}
1222	}	1523	}
1223		1524
		1525	sub invoke_visibility_change {
		1526	my ($self, $visible) = @_;
		1527
		1528	delete $self->{motion} unless $visible;
		1529
		1530	0
		1531	}
		1532
1224	sub _draw {	1533	sub _draw {
1225	my ($self) = @_;	1534	my ($self) = @_;
1226		1535
1227	my $child = $self->{children}[0];	1536	my $child = $self->{children}[0];
1228		1537
…		…
1233	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1542	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234		1543
1235	my $border = $self->border;	1544	my $border = $self->border;
1236		1545
1237	glColor @{ $self->{border_bg} };	1546	glColor @{ $self->{border_bg} };
1238	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1547	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1548	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1549	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1550	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1551
		1552	# move
		1553	my $w2 = ($w - $border) * .5;
		1554	my $h2 = ($h - $border) * .5;
		1555	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1556	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1557	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1558
		1559	# resize
		1560	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1561	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1562	unless $self->{has_close_button};
		1563	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1564	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1242		1565
1243	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1566	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244	glColor @{ $self->{bg} };	1567	glColor @{ $self->{bg} };
1245		1568
1246	# TODO: repeat texture not scale	1569	# TODO: repeat texture not scale
…		…
1265	if $self->{close_button};	1588	if $self->{close_button};
1266	}	1589	}
1267		1590
1268	#############################################################################	1591	#############################################################################
1269		1592
1270	package CFClient::UI::Table;	1593	package CFPlus::UI::Table;
1271		1594
1272	our @ISA = CFClient::UI::Base::;	1595	our @ISA = CFPlus::UI::Container::;
1273		1596
1274	use List::Util qw(max sum);	1597	use List::Util qw(max sum);
1275		1598
1276	use CFClient::OpenGL;	1599	use CFPlus::OpenGL;
1277		1600
1278	sub new {	1601	sub new {
1279	my $class = shift;	1602	my $class = shift;
1280		1603
1281	$class->SUPER::new (	1604	$class->SUPER::new (
1282	col_expand => [],	1605	col_expand => [],
		1606	row_expand => [],
1283	@_,	1607	@_,
1284	)	1608	)
1285	}	1609	}
1286		1610
1287	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}
1290
1291	sub add {	1611	sub add {
1292	my ($self, $x, $y, $child) = @_;	1612	my ($self, @widgets) = @_;
1293		1613
1294	$child->set_parent ($self);	1614	for my $child (@widgets) {
1295	$self->{children}[$y][$x] = $child;	1615	$child->{rowspan} ||= 1;
		1616	$child->{colspan} ||= 1;
		1617	}
1296		1618
1297	$self->realloc;	1619	$self->SUPER::add (@widgets);
1298	}	1620	}
1299		1621
1300	sub remove {	1622	sub add_at {
		1623	my $self = shift;
		1624
		1625	my @widgets;
		1626
		1627	while (@_) {
		1628	my ($col, $row, $child) = splice @_, 0, 3, ();
		1629
		1630	$child->{row} = $row;
		1631	$child->{col} = $col;
		1632
		1633	push @widgets, $child;
		1634	}
		1635
		1636	$self->add (@widgets);
		1637	}
		1638
		1639	sub get_wh {
1301	my ($self, $child) = @_;	1640	my ($self) = @_;
1302		1641
1303	# TODO: not yet implemented	1642	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		1643
1310	my @children = $self->children;	1644	my @children = $self->children;
1311	delete $self->{children};	1645
		1646	# first pass, columns
		1647	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1648	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1649
		1650	my $sw = sum @w[$c .. $c + $cs - 1];
		1651
		1652	if ($w > $sw) {
		1653	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1654	}
1312		1655	}
1313	for (@children) {
1314	delete $_->{parent};
1315	$_->hide;
1316	}
1317		1656
1318	$self->realloc;	1657	# second pass, rows
1319	}	1658	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)};	1659	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1334		1660
1335	$w[$x] = max $w[$x], $w;	1661	my $sh = sum @h[$r .. $r + $rs - 1];
1336	$h[$y] = max $h[$y], $h;	1662
		1663	if ($h > $sh) {
		1664	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1337	}	1665	}
1338	}	1666	}
1339		1667
1340	(\@w, \@h)	1668	(\@w, \@h)
1341	}	1669	}
…		…
1357	my ($ws, $hs) = $self->get_wh;	1685	my ($ws, $hs) = $self->get_wh;
1358		1686
1359	my $req_w = (sum @$ws) || 1;	1687	my $req_w = (sum @$ws) || 1;
1360	my $req_h = (sum @$hs) || 1;	1688	my $req_h = (sum @$hs) || 1;
1361		1689
1362	# TODO: nicer code && do row_expand	1690	# now linearly scale the rows/columns to the allocated size
1363	my @col_expand = @{$self->{col_expand}};	1691	my @col_expand = @{$self->{col_expand}};
1364	@col_expand = (1) x @$ws unless @col_expand;	1692	@col_expand = (1) x @$ws unless @col_expand;
1365	my $col_expand = (sum @col_expand) || 1;	1693	my $col_expand = (sum @col_expand) || 1;
1366		1694
1367	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1695	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1696
1371	CFClient::UI::harmonize $ws;	1697	CFPlus::UI::harmonize $ws;
		1698
		1699	my @row_expand = @{$self->{row_expand}};
		1700	@row_expand = (1) x @$ws unless @row_expand;
		1701	my $row_expand = (sum @row_expand) || 1;
		1702
		1703	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1704
1372	CFClient::UI::harmonize $hs;	1705	CFPlus::UI::harmonize $hs;
1373		1706
1374	my $y;	1707	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1708	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1375		1709
1376	for my $r (0 .. $#{$self->{children}}) {	1710	for my $widget ($self->children) {
1377	my $row = $self->{children}[$r]	1711	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1378	or next;
1379		1712
1380	my $x = 0;	1713	$widget->configure (
1381	my $row_h = $hs->[$r];	1714	$x[$c], $y[$r],
		1715	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1382		1716	);
1383	for my $c (0 .. $#$row) {	1717	}
1384	my $col_w = $ws->[$c];
1385		1718
1386	if (my $widget = $row->[$c]) {	1719	1
1387	$widget->configure ($x, $y, $col_w, $row_h);	1720	}
1388	}
1389		1721
1390	$x += $col_w;	1722	#############################################################################
		1723
		1724	package CFPlus::UI::Fixed;
		1725
		1726	use List::Util qw(min max);
		1727
		1728	our @ISA = CFPlus::UI::Container::;
		1729
		1730	sub add {
		1731	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1732
		1733	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1734	$self->SUPER::add ($child);
		1735	}
		1736
		1737	sub _scale($$$) {
		1738	my ($mode, $val, $max) = @_;
		1739
		1740	$mode eq "abs" ? $val
		1741	: $mode eq "rel" ? $val * $max
		1742	: 0
		1743	}
		1744
		1745	sub size_request {
		1746	my ($self) = @_;
		1747
		1748	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1749
		1750	# determine overall size by querying abs widgets
		1751	for my $child ($self->visible_children) {
		1752	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1753
		1754	if ($pos eq "abs") {
		1755	$w = _scale $size, $w, $child->{req_w};
		1756	$h = _scale $size, $h, $child->{req_h};
		1757
		1758	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1759	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1391	}	1760	}
		1761	}
1392		1762
1393	$y += $row_h;	1763	my $W = $x2 - $x1;
		1764	my $H = $y2 - $y1;
		1765
		1766	# now layout remaining widgets
		1767	for my $child ($self->visible_children) {
		1768	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1769
		1770	if ($pos ne "abs") {
		1771	$x = _scale $pos, $x, $W;
		1772	$y = _scale $pos, $x, $H;
		1773	$w = _scale $size, $w, $child->{req_w};
		1774	$h = _scale $size, $h, $child->{req_h};
		1775
		1776	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1777	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1778	}
		1779	}
		1780
		1781	my $W = $x2 - $x1;
		1782	my $H = $y2 - $y1;
		1783
		1784	($W, $H)
		1785	}
		1786
		1787	sub invoke_size_allocate {
		1788	my ($self, $W, $H) = @_;
		1789
		1790	for my $child ($self->visible_children) {
		1791	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1792
		1793	$x = _scale $pos, $x, $W;
		1794	$y = _scale $pos, $x, $H;
		1795	$w = _scale $size, $w, $child->{req_w};
		1796	$h = _scale $size, $h, $child->{req_h};
		1797
		1798	$child->configure ($x, $y, $w, $h);
1394	}	1799	}
1395		1800
1396	1	1801	1
1397	}	1802	}
1398		1803
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	#############################################################################	1804	#############################################################################
1424		1805
1425	package CFClient::UI::Box;	1806	package CFPlus::UI::Box;
1426		1807
1427	our @ISA = CFClient::UI::Container::;	1808	our @ISA = CFPlus::UI::Container::;
1428		1809
1429	sub size_request {	1810	sub size_request {
1430	my ($self) = @_;	1811	my ($self) = @_;
1431		1812
1432	$self->{vertical}	1813	$self->{vertical}
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1846	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1847	for 0 .. $#children;
1467	}	1848	}
1468	}	1849	}
1469		1850
1470	CFClient::UI::harmonize \@req;	1851	CFPlus::UI::harmonize \@req;
1471		1852
1472	my $pos = 0;	1853	my $pos = 0;
1473	for (0 .. $#children) {	1854	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1855	my $alloc = $req[$_];
1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1856	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1480	1	1861	1
1481	}	1862	}
1482		1863
1483	#############################################################################	1864	#############################################################################
1484		1865
1485	package CFClient::UI::HBox;	1866	package CFPlus::UI::HBox;
1486		1867
1487	our @ISA = CFClient::UI::Box::;	1868	our @ISA = CFPlus::UI::Box::;
1488		1869
1489	sub new {	1870	sub new {
1490	my $class = shift;	1871	my $class = shift;
1491		1872
1492	$class->SUPER::new (	1873	$class->SUPER::new (
…		…
1495	)	1876	)
1496	}	1877	}
1497		1878
1498	#############################################################################	1879	#############################################################################
1499		1880
1500	package CFClient::UI::VBox;	1881	package CFPlus::UI::VBox;
1501		1882
1502	our @ISA = CFClient::UI::Box::;	1883	our @ISA = CFPlus::UI::Box::;
1503		1884
1504	sub new {	1885	sub new {
1505	my $class = shift;	1886	my $class = shift;
1506		1887
1507	$class->SUPER::new (	1888	$class->SUPER::new (
…		…
1510	)	1891	)
1511	}	1892	}
1512		1893
1513	#############################################################################	1894	#############################################################################
1514		1895
1515	package CFClient::UI::Label;	1896	package CFPlus::UI::Label;
1516		1897
1517	our @ISA = CFClient::UI::DrawBG::;	1898	our @ISA = CFPlus::UI::DrawBG::;
1518		1899
1519	use CFClient::OpenGL;	1900	use CFPlus::OpenGL;
1520		1901
1521	sub new {	1902	sub new {
1522	my ($class, %arg) = @_;	1903	my ($class, %arg) = @_;
1523		1904
1524	my $self = $class->SUPER::new (	1905	my $self = $class->SUPER::new (
…		…
1527	#active_bg => none	1908	#active_bg => none
1528	#font => default_font	1909	#font => default_font
1529	#text => initial text	1910	#text => initial text
1530	#markup => initial narkup	1911	#markup => initial narkup
1531	#max_w => maximum pixel width	1912	#max_w => maximum pixel width
		1913	#style => 0, # render flags
1532	ellipsise => 3, # end	1914	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1915	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1916	fontsize => 1,
1535	align => -1,	1917	align => -1,
1536	valign => -1,	1918	valign => -1,
1537	padding_x => 2,	1919	padding_x => 2,
1538	padding_y => 2,	1920	padding_y => 2,
1539	can_events => 0,	1921	can_events => 0,
1540	%arg	1922	%arg
1541	);	1923	);
1542		1924
1543	if (exists $self->{template}) {	1925	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1926	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1927	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1928	$self->{template} = $layout;
1547	}	1929	}
1548		1930
1549	if (exists $self->{markup}) {	1931	if (exists $self->{markup}) {
…		…
1553	}	1935	}
1554		1936
1555	$self	1937	$self
1556	}	1938	}
1557		1939
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 {	1940	sub update {
1569	my ($self) = @_;	1941	my ($self) = @_;
1570		1942
1571	delete $self->{texture};	1943	delete $self->{texture};
1572	$self->SUPER::update;	1944	$self->SUPER::update;
…		…
1583	my ($self, $text) = @_;	1955	my ($self, $text) = @_;
1584		1956
1585	return if $self->{text} eq "T$text";	1957	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1958	$self->{text} = "T$text";
1587		1959
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	1960	$self->{layout}->set_text ($text);
1590		1961
1591	delete $self->{size_req};	1962	delete $self->{size_req};
1592	$self->realloc;	1963	$self->realloc;
1593	$self->update;	1964	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	1970	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	1971	$self->{text} = "M$markup";
1601		1972
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1973	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		1974
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	1975	$self->{layout}->set_markup ($markup);
1606		1976
1607	delete $self->{size_req};	1977	delete $self->{size_req};
1608	$self->realloc;	1978	$self->realloc;
1609	$self->update;	1979	$self->update;
…		…
1621		1991
1622	my ($w, $h) = $self->{layout}->size;	1992	my ($w, $h) = $self->{layout}->size;
1623		1993
1624	if (exists $self->{template}) {	1994	if (exists $self->{template}) {
1625	$self->{template}->set_font ($self->{font}) if $self->{font};	1995	$self->{template}->set_font ($self->{font}) if $self->{font};
		1996	$self->{template}->set_width ($self->{max_w} || -1);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1997	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		1998
1628	my ($w2, $h2) = $self->{template}->size;	1999	my ($w2, $h2) = $self->{template}->size;
1629		2000
1630	$w = List::Util::max $w, $w2;	2001	$w = List::Util::max $w, $w2;
…		…
1664		2035
1665	sub reconfigure {	2036	sub reconfigure {
1666	my ($self) = @_;	2037	my ($self) = @_;
1667		2038
1668	delete $self->{size_req};	2039	delete $self->{size_req};
		2040	delete $self->{texture};
1669		2041
1670	$self->SUPER::reconfigure;	2042	$self->SUPER::reconfigure;
1671	}	2043	}
1672		2044
1673	sub _draw {	2045	sub _draw {
1674	my ($self) = @_;	2046	my ($self) = @_;
1675		2047
1676	$self->SUPER::_draw; # draw background, if applicable	2048	$self->SUPER::_draw; # draw background, if applicable
1677		2049
1678	my $tex = $self->{texture} ||= do {	2050	my $size = $self->{texture} ||= do {
1679	$self->{layout}->set_foreground (@{$self->{fg}});	2051	$self->{layout}->set_foreground (@{$self->{fg}});
1680	$self->{layout}->set_font ($self->{font}) if $self->{font};	2052	$self->{layout}->set_font ($self->{font}) if $self->{font};
1681	$self->{layout}->set_width ($self->{w});	2053	$self->{layout}->set_width ($self->{w});
1682	$self->{layout}->set_ellipsise ($self->{ellipsise});	2054	$self->{layout}->set_ellipsise ($self->{ellipsise});
1683	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2055	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1684	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2056	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1685		2057
1686	new_from_layout CFClient::Texture $self->{layout}	2058	[$self->{layout}->size]
1687	};	2059	};
1688		2060
1689	unless (exists $self->{ox}) {	2061	unless (exists $self->{ox}) {
1690	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2062	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1691	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2063	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1692	: ($self->{w} - $tex->{w}) * 0.5);	2064	: ($self->{w} - $size->[0]) * 0.5);
1693		2065
1694	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2066	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1695	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2067	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1696	: ($self->{h} - $tex->{h}) * 0.5);	2068	: ($self->{h} - $size->[1]) * 0.5);
1697	};	2069	};
1698		2070
1699	glEnable GL_TEXTURE_2D;
1700
1701	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2071	my $w = List::Util::min $self->{w} + 4, $size->[0];
1702	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2072	my $h = List::Util::min $self->{h} + 2, $size->[1];
1703		2073
1704	if ($tex->{format} == GL_ALPHA) {	2074	$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	}	2075	}
1715		2076
1716	#############################################################################	2077	#############################################################################
1717		2078
1718	package CFClient::UI::EntryBase;	2079	package CFPlus::UI::EntryBase;
1719		2080
1720	our @ISA = CFClient::UI::Label::;	2081	our @ISA = CFPlus::UI::Label::;
1721		2082
1722	use CFClient::OpenGL;	2083	use CFPlus::OpenGL;
1723		2084
1724	sub new {	2085	sub new {
1725	my $class = shift;	2086	my $class = shift;
1726		2087
1727	$class->SUPER::new (	2088	$class->SUPER::new (
…		…
1731	active_fg => [0, 0, 0],	2092	active_fg => [0, 0, 0],
1732	can_hover => 1,	2093	can_hover => 1,
1733	can_focus => 1,	2094	can_focus => 1,
1734	valign => 0,	2095	valign => 0,
1735	can_events => 1,	2096	can_events => 1,
		2097	ellipsise => 0,
1736	#text => ...	2098	#text => ...
1737	#hidden => "*",	2099	#hidden => "*",
1738	@_	2100	@_
1739	)	2101	)
1740	}	2102	}
…		…
1785	my $sym = $ev->{sym};	2147	my $sym = $ev->{sym};
1786	my $uni = $ev->{unicode};	2148	my $uni = $ev->{unicode};
1787		2149
1788	my $text = $self->get_text;	2150	my $text = $self->get_text;
1789		2151
		2152	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2153
1790	if ($uni == 8) {	2154	if ($uni == 8) {
1791	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2155	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1792	} elsif ($uni == 127) {	2156	} elsif ($uni == 127) {
1793	substr $text, $self->{cursor}, 1, "";	2157	substr $text, $self->{cursor}, 1, "";
1794	} elsif ($sym == CFClient::SDLK_LEFT) {	2158	} elsif ($sym == CFPlus::SDLK_LEFT) {
1795	--$self->{cursor} if $self->{cursor};	2159	--$self->{cursor} if $self->{cursor};
1796	} elsif ($sym == CFClient::SDLK_RIGHT) {	2160	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1797	++$self->{cursor} if $self->{cursor} < length $self->{text};	2161	++$self->{cursor} if $self->{cursor} < length $self->{text};
1798	} elsif ($sym == CFClient::SDLK_HOME) {	2162	} elsif ($sym == CFPlus::SDLK_HOME) {
		2163	# what a hack
		2164	$self->{cursor} =
		2165	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2166	? length $1
		2167	: 0;
		2168	} elsif ($sym == CFPlus::SDLK_END) {
		2169	# uh, again
		2170	$self->{cursor} =
		2171	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2172	? $self->{cursor} + length $1
		2173	: length $self->{text};
		2174	} elsif ($uni == 21) { # ctrl-u
		2175	$text = "";
1799	$self->{cursor} = 0;	2176	$self->{cursor} = 0;
1800	} elsif ($sym == CFClient::SDLK_END) {
1801	$self->{cursor} = length $text;
1802	} elsif ($uni == 27) {	2177	} elsif ($uni == 27) {
1803	$self->emit ('escape');	2178	$self->emit ('escape');
1804	} elsif ($uni) {	2179	} elsif ($uni == 0x0d) {
		2180	substr $text, $self->{cursor}++, 0, "\012";
		2181	} elsif ($uni >= 0x20) {
1805	substr $text, $self->{cursor}++, 0, chr $uni;	2182	substr $text, $self->{cursor}++, 0, chr $uni;
1806	} else {	2183	} else {
1807	return 0;	2184	return 0;
1808	}	2185	}
1809		2186
1810	$self->_set_text ($text);	2187	$self->_set_text ($text);
1811		2188
1812	$self->realloc;	2189	$self->realloc;
		2190	$self->update;
1813		2191
1814	1	2192	1
1815	}	2193	}
1816		2194
1817	sub invoke_focus_in {	2195	sub invoke_focus_in {
…		…
1829		2207
1830	my $idx = $self->{layout}->xy_to_index ($x, $y);	2208	my $idx = $self->{layout}->xy_to_index ($x, $y);
1831		2209
1832	# byte-index to char-index	2210	# byte-index to char-index
1833	my $text = $self->{text};	2211	my $text = $self->{text};
1834	utf8::encode $text;	2212	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1835	$self->{cursor} = length substr $text, 0, $idx;	2213	$self->{cursor} = length $text;
1836		2214
1837	$self->_set_text ($self->{text});	2215	$self->_set_text ($self->{text});
1838	$self->update;	2216	$self->update;
1839		2217
1840	1	2218	1
…		…
1879	utf8::encode $text;	2257	utf8::encode $text;
1880		2258
1881	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2259	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1882	}	2260	}
1883		2261
1884	glColor @{$self->{fg}};
1885	glBegin GL_LINES;	2262	glBegin GL_LINES;
1886	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2263	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};	2264	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1888	glEnd;	2265	glEnd;
1889	}	2266	}
1890	}	2267	}
1891		2268
		2269	#############################################################################
		2270
1892	package CFClient::UI::Entry;	2271	package CFPlus::UI::Entry;
1893		2272
1894	our @ISA = CFClient::UI::EntryBase::;	2273	our @ISA = CFPlus::UI::EntryBase::;
1895		2274
1896	use CFClient::OpenGL;	2275	use CFPlus::OpenGL;
1897		2276
1898	sub invoke_key_down {	2277	sub invoke_key_down {
1899	my ($self, $ev) = @_;	2278	my ($self, $ev) = @_;
1900		2279
1901	my $sym = $ev->{sym};	2280	my $sym = $ev->{sym};
1902		2281
1903	if ($sym == 13) {	2282	if ($ev->{uni} == 0x0d || $sym == 13) {
1904	unshift @{$self->{history}},	2283	unshift @{$self->{history}},
1905	my $txt = $self->get_text;	2284	my $txt = $self->get_text;
1906		2285
1907	$self->{history_pointer} = -1;	2286	$self->{history_pointer} = -1;
1908	$self->{history_saveback} = '';	2287	$self->{history_saveback} = '';
1909	$self->emit (activate => $txt);	2288	$self->emit (activate => $txt);
1910	$self->update;	2289	$self->update;
1911		2290
1912	} elsif ($sym == CFClient::SDLK_UP) {	2291	} elsif ($sym == CFPlus::SDLK_UP) {
1913	if ($self->{history_pointer} < 0) {	2292	if ($self->{history_pointer} < 0) {
1914	$self->{history_saveback} = $self->get_text;	2293	$self->{history_saveback} = $self->get_text;
1915	}	2294	}
1916	if (@{$self->{history} || []} > 0) {	2295	if (@{$self->{history} || []} > 0) {
1917	$self->{history_pointer}++;	2296	$self->{history_pointer}++;
…		…
1919	$self->{history_pointer} = @{$self->{history} || []} - 1;	2298	$self->{history_pointer} = @{$self->{history} || []} - 1;
1920	}	2299	}
1921	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2300	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1922	}	2301	}
1923		2302
1924	} elsif ($sym == CFClient::SDLK_DOWN) {	2303	} elsif ($sym == CFPlus::SDLK_DOWN) {
1925	$self->{history_pointer}--;	2304	$self->{history_pointer}--;
1926	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2305	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1927		2306
1928	if ($self->{history_pointer} >= 0) {	2307	if ($self->{history_pointer} >= 0) {
1929	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2308	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1938	1	2317	1
1939	}	2318	}
1940		2319
1941	#############################################################################	2320	#############################################################################
1942		2321
		2322	package CFPlus::UI::TextEdit;
		2323
		2324	our @ISA = CFPlus::UI::EntryBase::;
		2325
		2326	use CFPlus::OpenGL;
		2327
		2328	sub move_cursor_ver {
		2329	my ($self, $dy) = @_;
		2330
		2331	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2332
		2333	$y += $dy;
		2334
		2335	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2336	$self->{cursor} = $index;
		2337	delete $self->{cur_h};
		2338	$self->update;
		2339	return;
		2340	}
		2341	}
		2342
		2343	sub invoke_key_down {
		2344	my ($self, $ev) = @_;
		2345
		2346	my $sym = $ev->{sym};
		2347
		2348	if ($sym == CFPlus::SDLK_UP) {
		2349	$self->move_cursor_ver (-1);
		2350	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2351	$self->move_cursor_ver (+1);
		2352	} else {
		2353	return $self->SUPER::invoke_key_down ($ev)
		2354	}
		2355
		2356	1
		2357	}
		2358
		2359	#############################################################################
		2360
1943	package CFClient::UI::Button;	2361	package CFPlus::UI::Button;
1944		2362
1945	our @ISA = CFClient::UI::Label::;	2363	our @ISA = CFPlus::UI::Label::;
1946		2364
1947	use CFClient::OpenGL;	2365	use CFPlus::OpenGL;
1948		2366
1949	my @tex =	2367	my @tex =
1950	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2368	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1951	qw(b1_button_active.png);	2369	qw(b1_button_inactive.png b1_button_active.png);
1952		2370
1953	sub new {	2371	sub new {
1954	my $class = shift;	2372	my $class = shift;
1955		2373
1956	$class->SUPER::new (	2374	$class->SUPER::new (
1957	padding_x => 4,	2375	padding_x => 4,
1958	padding_y => 4,	2376	padding_y => 4,
1959	fg => [1, 1, 1],	2377	fg => [1.0, 1.0, 1.0],
1960	active_fg => [0, 0, 1],	2378	active_fg => [0.8, 0.8, 0.8],
1961	can_hover => 1,	2379	can_hover => 1,
1962	align => 0,	2380	align => 0,
1963	valign => 0,	2381	valign => 0,
1964	can_events => 1,	2382	can_events => 1,
1965	@_	2383	@_
…		…
1983		2401
1984	glEnable GL_TEXTURE_2D;	2402	glEnable GL_TEXTURE_2D;
1985	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2403	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986	glColor 0, 0, 0, 1;	2404	glColor 0, 0, 0, 1;
1987		2405
		2406	my $tex = $tex[$GRAB == $self];
1988	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2407	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1989		2408
1990	glDisable GL_TEXTURE_2D;	2409	glDisable GL_TEXTURE_2D;
1991		2410
1992	$self->SUPER::_draw;	2411	$self->SUPER::_draw;
1993	}	2412	}
1994		2413
1995	#############################################################################	2414	#############################################################################
1996		2415
		2416	package CFPlus::UI::CheckBox;
		2417
		2418	our @ISA = CFPlus::UI::DrawBG::;
		2419
		2420	my @tex =
		2421	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2422	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2423
		2424	use CFPlus::OpenGL;
		2425
		2426	sub new {
		2427	my $class = shift;
		2428
		2429	$class->SUPER::new (
		2430	padding_x => 2,
		2431	padding_y => 2,
		2432	fg => [1, 1, 1],
		2433	active_fg => [1, 1, 0],
		2434	bg => [0, 0, 0, 0.2],
		2435	active_bg => [1, 1, 1, 0.5],
		2436	state => 0,
		2437	can_hover => 1,
		2438	@_
		2439	)
		2440	}
		2441
		2442	sub size_request {
		2443	my ($self) = @_;
		2444
		2445	(6) x 2
		2446	}
		2447
		2448	sub toggle {
		2449	my ($self) = @_;
		2450
		2451	$self->{state} = !$self->{state};
		2452	$self->emit (changed => $self->{state});
		2453	$self->update;
		2454	}
		2455
		2456	sub invoke_button_down {
		2457	my ($self, $ev, $x, $y) = @_;
		2458
		2459	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2460	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2461	$self->toggle;
		2462	} else {
		2463	return 0
		2464	}
		2465
		2466	1
		2467	}
		2468
		2469	sub _draw {
		2470	my ($self) = @_;
		2471
		2472	$self->SUPER::_draw;
		2473
		2474	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2475
		2476	my ($w, $h) = @$self{qw(w h)};
		2477
		2478	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2479
		2480	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2481
		2482	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2483
		2484	glEnable GL_TEXTURE_2D;
		2485	$tex->draw_quad_alpha (0, 0, $s, $s);
		2486	glDisable GL_TEXTURE_2D;
		2487	}
		2488
		2489	#############################################################################
		2490
		2491	package CFPlus::UI::Image;
		2492
		2493	our @ISA = CFPlus::UI::Base::;
		2494
		2495	use CFPlus::OpenGL;
		2496
		2497	our %texture_cache;
		2498
		2499	sub new {
		2500	my $class = shift;
		2501
		2502	my $self = $class->SUPER::new (
		2503	can_events => 0,
		2504	@_,
		2505	);
		2506
		2507	$self->{path} || $self->{tex}
		2508	or Carp::croak "'path' or 'tex' attributes required";
		2509
		2510	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2511	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2512
		2513	CFPlus::weaken $texture_cache{$self->{path}};
		2514
		2515	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2516
		2517	$self
		2518	}
		2519
		2520	sub STORABLE_freeze {
		2521	my ($self, $cloning) = @_;
		2522
		2523	$self->{path}
		2524	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2525
		2526	$self->{path}
		2527	}
		2528
		2529	sub STORABLE_attach {
		2530	my ($self, $cloning, $path) = @_;
		2531
		2532	$self->new (path => $path)
		2533	}
		2534
		2535	sub size_request {
		2536	my ($self) = @_;
		2537
		2538	($self->{tex}{w}, $self->{tex}{h})
		2539	}
		2540
		2541	sub _draw {
		2542	my ($self) = @_;
		2543
		2544	my $tex = $self->{tex};
		2545
		2546	my ($w, $h) = ($self->{w}, $self->{h});
		2547
		2548	if ($self->{rot90}) {
		2549	glRotate 90, 0, 0, 1;
		2550	glTranslate 0, -$self->{w}, 0;
		2551
		2552	($w, $h) = ($h, $w);
		2553	}
		2554
		2555	glEnable GL_TEXTURE_2D;
		2556	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2557
		2558	$tex->draw_quad (0, 0, $w, $h);
		2559
		2560	glDisable GL_TEXTURE_2D;
		2561	}
		2562
		2563	#############################################################################
		2564
1997	package CFClient::UI::ImageButton;	2565	package CFPlus::UI::ImageButton;
1998		2566
1999	our @ISA = CFClient::UI::Image::;	2567	our @ISA = CFPlus::UI::Image::;
2000		2568
2001	use CFClient::OpenGL;	2569	use CFPlus::OpenGL;
2002		2570
2003	my %textures;	2571	my %textures;
2004		2572
2005	sub new {	2573	sub new {
2006	my $class = shift;	2574	my $class = shift;
…		…
2028	1	2596	1
2029	}	2597	}
2030		2598
2031	#############################################################################	2599	#############################################################################
2032		2600
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;	2601	package CFPlus::UI::VGauge;
2102		2602
2103	our @ISA = CFClient::UI::Base::;	2603	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		2604
2164	use List::Util qw(min max);	2605	use List::Util qw(min max);
2165		2606
2166	use CFClient::OpenGL;	2607	use CFPlus::OpenGL;
2167		2608
2168	my %tex = (	2609	my %tex = (
2169	food => [	2610	food => [
2170	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2611	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2171	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2612	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2172	],	2613	],
2173	grace => [	2614	grace => [
2174	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2615	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/	2616	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2176	],	2617	],
2177	hp => [	2618	hp => [
2178	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2619	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2179	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2620	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2180	],	2621	],
2181	mana => [	2622	mana => [
2182	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2623	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/	2624	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2184	],	2625	],
2185	);	2626	);
2186		2627
2187	# eg. VGauge->new (gauge => 'food'), default gauge: food	2628	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2247	my $ycut1 = max 0, min 1, $ycut;	2688	my $ycut1 = max 0, min 1, $ycut;
2248	my $ycut2 = max 0, min 1, $ycut - 1;	2689	my $ycut2 = max 0, min 1, $ycut - 1;
2249		2690
2250	my $h1 = $self->{h} * (1 - $ycut1);	2691	my $h1 = $self->{h} * (1 - $ycut1);
2251	my $h2 = $self->{h} * (1 - $ycut2);	2692	my $h2 = $self->{h} * (1 - $ycut2);
		2693	my $h3 = $self->{h};
		2694
		2695	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2252		2696
2253	glEnable GL_BLEND;	2697	glEnable GL_BLEND;
2254	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2698	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2699	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2256	glEnable GL_TEXTURE_2D;	2700	glEnable GL_TEXTURE_2D;
…		…
2275		2719
2276	if ($t3) {	2720	if ($t3) {
2277	glBindTexture GL_TEXTURE_2D, $t3->{name};	2721	glBindTexture GL_TEXTURE_2D, $t3->{name};
2278	glBegin GL_QUADS;	2722	glBegin GL_QUADS;
2279	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2723	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2280	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2724	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2281	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2725	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2282	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2726	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2283	glEnd;	2727	glEnd;
2284	}	2728	}
2285		2729
2286	glDisable GL_BLEND;	2730	glDisable GL_BLEND;
2287	glDisable GL_TEXTURE_2D;	2731	glDisable GL_TEXTURE_2D;
2288	}	2732	}
2289		2733
2290	#############################################################################	2734	#############################################################################
2291		2735
2292	package CFClient::UI::Gauge;	2736	package CFPlus::UI::Gauge;
2293		2737
2294	our @ISA = CFClient::UI::VBox::;	2738	our @ISA = CFPlus::UI::VBox::;
2295		2739
2296	sub new {	2740	sub new {
2297	my ($class, %arg) = @_;	2741	my ($class, %arg) = @_;
2298		2742
2299	my $self = $class->SUPER::new (	2743	my $self = $class->SUPER::new (
…		…
2301	can_hover => 1,	2745	can_hover => 1,
2302	can_events => 1,	2746	can_events => 1,
2303	%arg,	2747	%arg,
2304	);	2748	);
2305		2749
2306	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2750	$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);	2751	$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");	2752	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2309		2753
2310	$self	2754	$self
2311	}	2755	}
2312		2756
2313	sub set_fontsize {	2757	sub set_fontsize {
…		…
2334	$self->{value}->set_text ($val);	2778	$self->{value}->set_text ($val);
2335	}	2779	}
2336		2780
2337	#############################################################################	2781	#############################################################################
2338		2782
2339	package CFClient::UI::Slider;	2783	package CFPlus::UI::Slider;
2340		2784
2341	use strict;	2785	use strict;
2342		2786
2343	use CFClient::OpenGL;	2787	use CFPlus::OpenGL;
2344		2788
2345	our @ISA = CFClient::UI::DrawBG::;	2789	our @ISA = CFPlus::UI::DrawBG::;
2346		2790
2347	my @tex =	2791	my @tex =
2348	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2792	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2349	qw(s1_slider.png s1_slider_bg.png);	2793	qw(s1_slider.png s1_slider_bg.png);
2350		2794
2351	sub new {	2795	sub new {
2352	my $class = shift;	2796	my $class = shift;
2353		2797
…		…
2442	}	2886	}
2443		2887
2444	1	2888	1
2445	}	2889	}
2446		2890
		2891	sub invoke_mouse_wheel {
		2892	my ($self, $ev) = @_;
		2893
		2894	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2895
		2896	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2897
		2898	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2899
		2900	! ! $delta
		2901	}
		2902
2447	sub update {	2903	sub update {
2448	my ($self) = @_;	2904	my ($self) = @_;
2449		2905
2450	delete $self->{knob_w};	2906	delete $self->{knob_w};
2451	$self->SUPER::update;	2907	$self->SUPER::update;
…		…
2498	glDisable GL_TEXTURE_2D;	2954	glDisable GL_TEXTURE_2D;
2499	}	2955	}
2500		2956
2501	#############################################################################	2957	#############################################################################
2502		2958
2503	package CFClient::UI::ValSlider;	2959	package CFPlus::UI::ValSlider;
2504		2960
2505	our @ISA = CFClient::UI::HBox::;	2961	our @ISA = CFPlus::UI::HBox::;
2506		2962
2507	sub new {	2963	sub new {
2508	my ($class, %arg) = @_;	2964	my ($class, %arg) = @_;
2509		2965
2510	my $range = delete $arg{range};	2966	my $range = delete $arg{range};
2511		2967
2512	my $self = $class->SUPER::new (	2968	my $self = $class->SUPER::new (
2513	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2969	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2514	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2970	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2515	to_value => sub { shift },	2971	to_value => sub { shift },
2516	from_value => sub { shift },	2972	from_value => sub { shift },
2517	%arg,	2973	%arg,
2518	);	2974	);
2519		2975
…		…
2539	sub set_range { shift->{slider}->set_range (@_) }	2995	sub set_range { shift->{slider}->set_range (@_) }
2540	sub set_value { shift->{slider}->set_value (@_) }	2996	sub set_value { shift->{slider}->set_value (@_) }
2541		2997
2542	#############################################################################	2998	#############################################################################
2543		2999
2544	package CFClient::UI::TextScroller;	3000	package CFPlus::UI::TextScroller;
2545		3001
2546	our @ISA = CFClient::UI::HBox::;	3002	our @ISA = CFPlus::UI::HBox::;
2547		3003
2548	use CFClient::OpenGL;	3004	use CFPlus::OpenGL;
2549		3005
2550	sub new {	3006	sub new {
2551	my $class = shift;	3007	my $class = shift;
2552		3008
2553	my $self = $class->SUPER::new (	3009	my $self = $class->SUPER::new (
2554	fontsize => 1,	3010	fontsize => 1,
2555	can_events => 0,	3011	can_events => 1,
2556	indent => 0,	3012	indent => 0,
2557	#font => default_font	3013	#font => default_font
2558	@_,	3014	@_,
2559		3015
2560	layout => (new CFClient::Layout 1),	3016	layout => (new CFPlus::Layout),
2561	par => [],	3017	par => [],
		3018	max_par => 0,
2562	height => 0,	3019	height => 0,
2563	children => [	3020	children => [
2564	(new CFClient::UI::Empty expand => 1),	3021	(new CFPlus::UI::Empty expand => 1),
2565	(new CFClient::UI::Slider vertical => 1),	3022	(new CFPlus::UI::Slider vertical => 1),
2566	],	3023	],
2567	);	3024	);
2568		3025
2569	$self->{children}[1]->connect (changed => sub { $self->update });	3026	$self->{children}[1]->connect (changed => sub { $self->update });
2570		3027
…		…
2600		3057
2601	$self->reflow;	3058	$self->reflow;
2602		3059
2603	local $self->{children} = [$empty, $slider];	3060	local $self->{children} = [$empty, $slider];
2604	$self->SUPER::invoke_size_allocate ($w, $h)	3061	$self->SUPER::invoke_size_allocate ($w, $h)
		3062	}
		3063
		3064	sub invoke_mouse_wheel {
		3065	my ($self, $ev) = @_;
		3066
		3067	return 0 unless $ev->{dy}; # only vertical movements
		3068
		3069	$self->{children}[1]->emit (mouse_wheel => $ev);
		3070
		3071	1
2605	}	3072	}
2606		3073
2607	sub get_layout {	3074	sub get_layout {
2608	my ($self, $para) = @_;	3075	my ($self, $para) = @_;
2609		3076
…		…
2637		3104
2638	# todo: base offset on lines or so, not on pixels	3105	# todo: base offset on lines or so, not on pixels
2639	$self->{children}[1]->set_value ($offset);	3106	$self->{children}[1]->set_value ($offset);
2640	}	3107	}
2641		3108
		3109	sub current_paragraph {
		3110	my ($self) = @_;
		3111
		3112	$self->{top_paragraph} - 1
		3113	}
		3114
		3115	sub scroll_to {
		3116	my ($self, $para) = @_;
		3117
		3118	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3119
		3120	$self->{scroll_to} = $para;
		3121	$self->update;
		3122	}
		3123
2642	sub clear {	3124	sub clear {
2643	my ($self) = @_;	3125	my ($self) = @_;
2644		3126
2645	my (undef, undef, @other) = @{ $self->{children} };	3127	my (undef, undef, @other) = @{ $self->{children} };
2646	$self->remove ($_) for @other;	3128	$self->remove ($_) for @other;
…		…
2649	$self->{height} = 0;	3131	$self->{height} = 0;
2650	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3132	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2651	}	3133	}
2652		3134
2653	sub add_paragraph {	3135	sub add_paragraph {
2654	my ($self, $color, $para, $indent) = @_;	3136	my $self = shift;
2655		3137
2656	my ($text, @w) = ref $para ? @$para : $para;	3138	for my $para (@_) {
2657
2658	$para = {	3139	$para = {
		3140	fg => [1, 1, 1, 1],
		3141	indent => 0,
		3142	markup => "",
		3143	widget => [],
		3144	ref $para ? %$para : (markup => $para),
2659	w => 1e10,	3145	w => 1e10,
2660	wrapped => 1,	3146	wrapped => 1,
2661	fg => $color,
2662	indent => $indent,
2663	markup => $text,
2664	widget => \@w,
2665	};	3147	};
2666		3148
2667	$self->add (@w) if @w;	3149	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2668	push @{$self->{par}}, $para;	3150	push @{$self->{par}}, $para;
		3151	}
		3152
		3153	if (my $max = $self->{max_par}) {
		3154	shift @{$self->{par}} while @{$self->{par}} > $max;
		3155	}
2669		3156
2670	$self->{need_reflow}++;	3157	$self->{need_reflow}++;
2671	$self->update;	3158	$self->update;
2672	}	3159	}
2673		3160
2674	sub scroll_to_bottom {	3161	sub scroll_to_bottom {
2675	my ($self) = @_;	3162	my ($self) = @_;
2676		3163
2677	$self->{scroll_to_bottom} = 1;	3164	$self->{scroll_to} = $#{$self->{par}};
2678	$self->update;	3165	$self->update;
2679	}	3166	}
2680		3167
		3168	sub force_uptodate {
		3169	my ($self) = @_;
		3170
		3171	if (delete $self->{need_reflow}) {
		3172	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3173
		3174	my $height = 0;
		3175
		3176	for my $para (@{$self->{par}}) {
		3177	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3178	my $layout = $self->get_layout ($para);
		3179	my ($w, $h) = $layout->size;
		3180
		3181	$para->{w} = $w + $para->{indent};
		3182	$para->{h} = $h;
		3183	$para->{wrapped} = $layout->has_wrapped;
		3184	}
		3185
		3186	$para->{y} = $height;
		3187	$height += $para->{h};
		3188	}
		3189
		3190	$self->{height} = $height;
		3191	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3192
		3193	delete $self->{texture};
		3194	}
		3195
		3196	if (my $paridx = delete $self->{scroll_to}) {
		3197	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3198	}
		3199	}
		3200
2681	sub update {	3201	sub update {
2682	my ($self) = @_;	3202	my ($self) = @_;
2683		3203
2684	$self->SUPER::update;	3204	$self->SUPER::update;
2685		3205
2686	return unless $self->{h} > 0;	3206	return unless $self->{h} > 0;
2687		3207
2688	delete $self->{texture};	3208	delete $self->{texture};
2689		3209
2690	$ROOT->on_post_alloc ($self => sub {	3210	$ROOT->on_post_alloc ($self => sub {
		3211	$self->force_uptodate;
		3212
2691	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3213	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2692		3214
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 {	3215	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2721	glClearColor 0, 0, 0, 0;	3216	glClearColor 0, 0, 0, 0;
2722	glClear GL_COLOR_BUFFER_BIT;	3217	glClear GL_COLOR_BUFFER_BIT;
2723		3218
		3219	package CFPlus::UI::Base;
		3220	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3221	(0, 0, $self->{w}, $self->{h});
		3222
		3223	my $top = int $self->{children}[1]{range}[0];
		3224
		3225	my $paridx = 0;
		3226	my $top_paragraph;
2724	my $top = int $self->{children}[1]{range}[0];	3227	my $top = int $self->{children}[1]{range}[0];
2725		3228
2726	my $y0 = $top;	3229	my $y0 = $top;
2727	my $y1 = $top + $H;	3230	my $y1 = $top + $H;
2728		3231
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}}) {	3232	for my $para (@{$self->{par}}) {
2736	my $h = $para->{h};	3233	my $h = $para->{h};
		3234	my $y = $para->{y};
2737		3235
2738	if ($y0 < $y + $h && $y < $y1) {	3236	if ($y0 < $y + $h && $y < $y1) {
2739
2740	my $layout = $self->get_layout ($para);	3237	my $layout = $self->get_layout ($para);
2741		3238
2742	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2743
2744	glRasterPos $para->{indent}, $y - $y0;	3239	$layout->render ($para->{indent}, $y - $y0);
2745	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746		3240
2747	if (my @w = @{ $para->{widget} }) {	3241	if (my @w = @{ $para->{widget} }) {
2748	my @s = $layout->get_shapes;	3242	my @s = $layout->get_shapes;
2749		3243
2750	glDisable GL_BLEND;
2751	for (@w) {	3244	for (@w) {
2752	my ($dx, $dy) = splice @s, 0, 2, ();	3245	my ($dx, $dy) = splice @s, 0, 2, ();
2753		3246
2754	$_->{x} = $dx + $para->{indent};	3247	$_->{x} = $dx + $para->{indent};
2755	$_->{y} = $dy + $y - $y0;	3248	$_->{y} = $dy + $y - $y0;
2756		3249
2757	$_->draw;	3250	$_->draw;
2758	}	3251	}
2759	glEnable GL_BLEND;
2760	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761	}	3252	}
2762	}	3253	}
2763		3254
2764	$y += $h;	3255	$paridx++;
		3256	$top_paragraph ||= $paridx if $y >= $top;
2765	}	3257	}
2766		3258
2767	glDisable GL_BLEND;	3259	$self->{top_paragraph} = $top_paragraph;
2768	};	3260	};
2769	});	3261	});
2770	}	3262	}
2771		3263
2772	sub reconfigure {	3264	sub reconfigure {
…		…
2790	$self->{children}[1]->draw;	3282	$self->{children}[1]->draw;
2791	}	3283	}
2792		3284
2793	#############################################################################	3285	#############################################################################
2794		3286
2795	package CFClient::UI::Animator;	3287	package CFPlus::UI::Animator;
2796		3288
2797	use CFClient::OpenGL;	3289	use CFPlus::OpenGL;
2798		3290
2799	our @ISA = CFClient::UI::Bin::;	3291	our @ISA = CFPlus::UI::Bin::;
2800		3292
2801	sub moveto {	3293	sub moveto {
2802	my ($self, $x, $y) = @_;	3294	my ($self, $x, $y) = @_;
2803		3295
2804	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3296	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2832	glPopMatrix;	3324	glPopMatrix;
2833	}	3325	}
2834		3326
2835	#############################################################################	3327	#############################################################################
2836		3328
2837	package CFClient::UI::Flopper;	3329	package CFPlus::UI::Flopper;
2838		3330
2839	our @ISA = CFClient::UI::Button::;	3331	our @ISA = CFPlus::UI::Button::;
2840		3332
2841	sub new {	3333	sub new {
2842	my $class = shift;	3334	my $class = shift;
2843		3335
2844	my $self = $class->SUPER::new (	3336	my $self = $class->SUPER::new (
…		…
2856	$self->{other}->toggle_visibility;	3348	$self->{other}->toggle_visibility;
2857	}	3349	}
2858		3350
2859	#############################################################################	3351	#############################################################################
2860		3352
2861	package CFClient::UI::Tooltip;	3353	package CFPlus::UI::Tooltip;
2862		3354
2863	our @ISA = CFClient::UI::Bin::;	3355	our @ISA = CFPlus::UI::Bin::;
2864		3356
2865	use CFClient::OpenGL;	3357	use CFPlus::OpenGL;
2866		3358
2867	sub new {	3359	sub new {
2868	my $class = shift;	3360	my $class = shift;
2869		3361
2870	$class->SUPER::new (	3362	$class->SUPER::new (
…		…
2873	)	3365	)
2874	}	3366	}
2875		3367
2876	sub set_tooltip_from {	3368	sub set_tooltip_from {
2877	my ($self, $widget) = @_;	3369	my ($self, $widget) = @_;
		3370
		3371	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3372	if $widget->{tooltip} =~ /^#(.*)$/;
2878		3373
2879	my $tooltip = $widget->{tooltip};	3374	my $tooltip = $widget->{tooltip};
2880		3375
2881	if ($ENV{CFPLUS_DEBUG} & 2) {	3376	if ($ENV{CFPLUS_DEBUG} & 2) {
2882	$tooltip .= "\n\n" . (ref $widget) . "\n"	3377	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2886	}	3381	}
2887		3382
2888	$tooltip =~ s/^\n+//;	3383	$tooltip =~ s/^\n+//;
2889	$tooltip =~ s/\n+$//;	3384	$tooltip =~ s/\n+$//;
2890		3385
2891	$self->add (new CFClient::UI::Label	3386	$self->add (new CFPlus::UI::Label
2892	markup => $tooltip,	3387	markup => $tooltip,
2893	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3388	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2894	fontsize => 0.8,	3389	fontsize => 0.8,
2895	fg => [0, 0, 0, 1],	3390	style => 1, # FLAG_INVERSE
2896	ellipsise => 0,	3391	ellipsise => 0,
2897	font => ($widget->{tooltip_font} || $::FONT_PROP),	3392	font => ($widget->{tooltip_font} || $::FONT_PROP),
2898	);	3393	);
2899	}	3394	}
2900		3395
…		…
2919		3414
2920	$self->{root}->on_post_alloc ("move_$self" => sub {	3415	$self->{root}->on_post_alloc ("move_$self" => sub {
2921	my $widget = $self->{owner}	3416	my $widget = $self->{owner}
2922	or return;	3417	or return;
2923		3418
		3419	if ($widget->{visible}) {
2924	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3420	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2925		3421
2926	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3422	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2927	if $x + $self->{w} > $self->{root}{w};	3423	if $x + $self->{w} > $self->{root}{w};
2928		3424
2929	$self->move_abs ($x, $y);	3425	$self->move_abs ($x, $y);
		3426	} else {
		3427	$self->hide;
		3428	}
2930	});	3429	});
2931	}	3430	}
2932		3431
2933	sub _draw {	3432	sub _draw {
2934	my ($self) = @_;	3433	my ($self) = @_;
…		…
2958	$self->SUPER::_draw;	3457	$self->SUPER::_draw;
2959	}	3458	}
2960		3459
2961	#############################################################################	3460	#############################################################################
2962		3461
2963	package CFClient::UI::Face;	3462	package CFPlus::UI::Face;
2964		3463
2965	our @ISA = CFClient::UI::Base::;	3464	our @ISA = CFPlus::UI::DrawBG::;
2966		3465
2967	use CFClient::OpenGL;	3466	use CFPlus::OpenGL;
2968		3467
2969	sub new {	3468	sub new {
2970	my $class = shift;	3469	my $class = shift;
2971		3470
2972	my $self = $class->SUPER::new (	3471	my $self = $class->SUPER::new (
		3472	size_w => 32,
		3473	size_h => 8,
2973	aspect => 1,	3474	aspect => 1,
2974	can_events => 0,	3475	can_events => 0,
2975	@_,	3476	@_,
2976	);	3477	);
2977		3478
2978	if ($self->{anim} && $self->{animspeed}) {	3479	if ($self->{anim} && $self->{animspeed}) {
2979	Scalar::Util::weaken (my $widget = $self);	3480	CFPlus::weaken (my $widget = $self);
2980		3481
		3482	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3483	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2981	$self->{timer} = Event->timer (	3484	$self->{timer} = Event->timer (
2982	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2983	hard => 1,	3485	parked => 1,
2984	interval => $self->{animspeed},
2985	cb => sub {	3486	cb => sub {
		3487	return unless $::CONN && $widget;
		3488
2986	++$widget->{frame};	3489	++$widget->{frame};
		3490	$widget->update_face;
2987	$widget->update;	3491	$widget->update;
		3492
		3493	$widget->update_timer;
2988	},	3494	},
2989	);	3495	);
		3496
		3497	$self->update_face;
		3498	$self->update_timer;
2990	}	3499	}
2991		3500
2992	$self	3501	$self
2993	}	3502	}
2994		3503
		3504	sub update_timer {
		3505	my ($self) = @_;
		3506
		3507	return unless $self->{timer};
		3508
		3509	if ($self->{visible}) {
		3510	$self->{timer}->at (
		3511	$self->{anim_start}
		3512	+ $self->{animspeed}
		3513	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3514	);
		3515	$self->{timer}->start;
		3516	} else {
		3517	$self->{timer}->stop;
		3518	}
		3519	}
		3520
		3521	sub update_face {
		3522	my ($self) = @_;
		3523
		3524	return unless $::CONN;
		3525
		3526	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3527	if ($anim && @$anim) {
		3528	delete $self->{wait_face};
		3529	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3530	}
		3531	}
		3532	}
		3533
2995	sub size_request {	3534	sub size_request {
2996	(32, 8)	3535	my ($self) = @_;
		3536
		3537	if ($::CONN) {
		3538	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3539	if (my $tex = $::CONN->{texture}[$faceid]) {
		3540	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3541	} else {
		3542	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3543	$self->realloc;
		3544	});
		3545	}
		3546	}
		3547	}
		3548
		3549	($self->{size_w} || 8, $self->{size_h} || 8)
2997	}	3550	}
2998		3551
2999	sub update {	3552	sub update {
3000	my ($self) = @_;	3553	my ($self) = @_;
3001		3554
3002	return unless $self->{visible};	3555	return unless $self->{visible};
3003		3556
3004	$self->SUPER::update;	3557	$self->SUPER::update;
3005	}	3558	}
3006		3559
		3560	sub invoke_visibility_change {
		3561	my ($self) = @_;
		3562
		3563	$self->update_timer;
		3564
		3565	0
		3566	}
		3567
3007	sub _draw {	3568	sub _draw {
3008	my ($self) = @_;	3569	my ($self) = @_;
3009		3570
3010	return unless $::CONN;	3571	return unless $::CONN;
3011		3572
3012	my $face;	3573	$self->SUPER::_draw;
3013		3574
3014	if ($self->{frame}) {
3015	my $anim = $::CONN->{anim}[$self->{anim}];	3575	my $faceid = $::CONN->{faceid}[$self->{face}]
3016		3576	or return;
3017	$face = $anim->[ $self->{frame} % @$anim ]
3018	if $anim && @$anim;
3019	}
3020		3577
3021	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3578	my $tex = $::CONN->{texture}[$faceid];
3022		3579
3023	if ($tex) {	3580	if ($tex) {
3024	glEnable GL_TEXTURE_2D;	3581	glEnable GL_TEXTURE_2D;
3025	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3582	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3026	glColor 0, 0, 0, 1;	3583	glColor 0, 0, 0, 1;
…		…
3030	}	3587	}
3031		3588
3032	sub destroy {	3589	sub destroy {
3033	my ($self) = @_;	3590	my ($self) = @_;
3034		3591
3035	$self->{timer}->cancel	3592	(delete $self->{timer})->cancel
3036	if $self->{timer};	3593	if $self->{timer};
3037		3594
3038	$self->SUPER::destroy;	3595	$self->SUPER::destroy;
3039	}	3596	}
3040		3597
3041	#############################################################################	3598	#############################################################################
3042		3599
3043	package CFClient::UI::Buttonbar;	3600	package CFPlus::UI::Buttonbar;
3044		3601
3045	our @ISA = CFClient::UI::HBox::;	3602	our @ISA = CFPlus::UI::HBox::;
3046		3603
3047	# TODO: should actualyl wrap buttons and other goodies.	3604	# TODO: should actually wrap buttons and other goodies.
3048		3605
3049	#############################################################################	3606	#############################################################################
3050		3607
3051	package CFClient::UI::Menu;	3608	package CFPlus::UI::Menu;
3052		3609
3053	our @ISA = CFClient::UI::FancyFrame::;	3610	our @ISA = CFPlus::UI::Toplevel::;
3054		3611
3055	use CFClient::OpenGL;	3612	use CFPlus::OpenGL;
3056		3613
3057	sub new {	3614	sub new {
3058	my $class = shift;	3615	my $class = shift;
3059		3616
3060	my $self = $class->SUPER::new (	3617	my $self = $class->SUPER::new (
3061	items => [],	3618	items => [],
3062	z => 100,	3619	z => 100,
3063	@_,	3620	@_,
3064	);	3621	);
3065		3622
3066	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3623	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3067		3624
3068	for my $item (@{ $self->{items} }) {	3625	for my $item (@{ $self->{items} }) {
3069	my ($widget, $cb, $tooltip) = @$item;	3626	my ($widget, $cb, $tooltip) = @$item;
3070		3627
3071	# handle various types of items, only text for now	3628	# handle various types of items, only text for now
3072	if (!ref $widget) {	3629	if (!ref $widget) {
		3630	if ($widget =~ /\t/) {
		3631	my ($left, $right) = split /\t/, $widget, 2;
		3632
3073	$widget = new CFClient::UI::Label	3633	$widget = new CFPlus::UI::HBox
3074	can_hover => 1,	3634	can_hover => 1,
3075	can_events => 1,	3635	can_events => 1,
		3636	tooltip => $tooltip,
		3637	children => [
		3638	(new CFPlus::UI::Label markup => $left, expand => 1),
		3639	(new CFPlus::UI::Label markup => $right, align => +1),
		3640	],
		3641	;
		3642
		3643	} else {
		3644	$widget = new CFPlus::UI::Label
		3645	can_hover => 1,
		3646	can_events => 1,
3076	markup => $widget,	3647	markup => $widget,
3077	tooltip => $tooltip	3648	tooltip => $tooltip;
		3649	}
3078	}	3650	}
3079		3651
3080	$self->{item}{$widget} = $item;	3652	$self->{item}{$widget} = $item;
3081		3653
3082	$self->{vbox}->add ($widget);	3654	$self->{vbox}->add ($widget);
…		…
3125	1	3697	1
3126	}	3698	}
3127		3699
3128	#############################################################################	3700	#############################################################################
3129		3701
3130	package CFClient::UI::Multiplexer;	3702	package CFPlus::UI::Multiplexer;
3131		3703
3132	our @ISA = CFClient::UI::Container::;	3704	our @ISA = CFPlus::UI::Container::;
3133		3705
3134	sub new {	3706	sub new {
3135	my $class = shift;	3707	my $class = shift;
3136		3708
3137	my $self = $class->SUPER::new (	3709	my $self = $class->SUPER::new (
…		…
3151		3723
3152	$self->{current} = $self->{children}[0]	3724	$self->{current} = $self->{children}[0]
3153	if @{ $self->{children} };	3725	if @{ $self->{children} };
3154	}	3726	}
3155		3727
		3728	sub get_current_page {
		3729	my ($self) = @_;
		3730
		3731	$self->{current}
		3732	}
		3733
3156	sub set_current_page {	3734	sub set_current_page {
3157	my ($self, $page_or_widget) = @_;	3735	my ($self, $page_or_widget) = @_;
3158		3736
3159	my $widget = ref $page_or_widget	3737	my $widget = ref $page_or_widget
3160	? $page_or_widget	3738	? $page_or_widget
…		…
3192	$self->{current}->draw;	3770	$self->{current}->draw;
3193	}	3771	}
3194		3772
3195	#############################################################################	3773	#############################################################################
3196		3774
3197	package CFClient::UI::Notebook;	3775	package CFPlus::UI::Notebook;
3198		3776
3199	our @ISA = CFClient::UI::VBox::;	3777	our @ISA = CFPlus::UI::VBox::;
3200		3778
3201	sub new {	3779	sub new {
3202	my $class = shift;	3780	my $class = shift;
3203		3781
3204	my $self = $class->SUPER::new (	3782	my $self = $class->SUPER::new (
3205	buttonbar => (new CFClient::UI::Buttonbar),	3783	buttonbar => (new CFPlus::UI::Buttonbar),
3206	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3784	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3207	# filter => # will be put between multiplexer and $self	3785	# filter => # will be put between multiplexer and $self
3208	@_,	3786	@_,
3209	);	3787	);
3210		3788
3211	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3789	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3215	}	3793	}
3216		3794
3217	sub add {	3795	sub add {
3218	my ($self, $title, $widget, $tooltip) = @_;	3796	my ($self, $title, $widget, $tooltip) = @_;
3219		3797
3220	Scalar::Util::weaken $self;	3798	CFPlus::weaken $self;
3221		3799
3222	$self->{buttonbar}->add (new CFClient::UI::Button	3800	$self->{buttonbar}->add (new CFPlus::UI::Button
3223	markup => $title,	3801	markup => $title,
3224	tooltip => $tooltip,	3802	tooltip => $tooltip,
3225	on_activate => sub { $self->set_current_page ($widget) },	3803	on_activate => sub { $self->set_current_page ($widget) },
3226	);	3804	);
3227		3805
3228	$self->{multiplexer}->add ($widget);	3806	$self->{multiplexer}->add ($widget);
3229	}	3807	}
3230		3808
		3809	sub get_current_page {
		3810	my ($self) = @_;
		3811
		3812	$self->{multiplexer}->get_current_page
		3813	}
		3814
3231	sub set_current_page {	3815	sub set_current_page {
3232	my ($self, $page) = @_;	3816	my ($self, $page) = @_;
3233		3817
3234	$self->{multiplexer}->set_current_page ($page);	3818	$self->{multiplexer}->set_current_page ($page);
3235	$self->emit (page_changed => $self->{multiplexer}{current});	3819	$self->emit (page_changed => $self->{multiplexer}{current});
3236	}	3820	}
3237		3821
3238	#############################################################################	3822	#############################################################################
3239		3823
3240	package CFClient::UI::Combobox;	3824	package CFPlus::UI::Selector;
3241		3825
3242	use utf8;	3826	use utf8;
3243		3827
3244	our @ISA = CFClient::UI::Button::;	3828	our @ISA = CFPlus::UI::Button::;
3245		3829
3246	sub new {	3830	sub new {
3247	my $class = shift;	3831	my $class = shift;
3248		3832
3249	my $self = $class->SUPER::new (	3833	my $self = $class->SUPER::new (
…		…
3266	my ($value, $title, $tooltip) = @$_;	3850	my ($value, $title, $tooltip) = @$_;
3267		3851
3268	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3852	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269	}	3853	}
3270		3854
3271	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3855	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272	}	3856	}
3273		3857
3274	sub _set_value {	3858	sub _set_value {
3275	my ($self, $value) = @_;	3859	my ($self, $value) = @_;
3276		3860
…		…
3291	$self->emit (changed => $value);	3875	$self->emit (changed => $value);
3292	}	3876	}
3293		3877
3294	#############################################################################	3878	#############################################################################
3295		3879
3296	package CFClient::UI::Statusbox;	3880	package CFPlus::UI::Statusbox;
3297		3881
3298	our @ISA = CFClient::UI::VBox::;	3882	our @ISA = CFPlus::UI::VBox::;
3299		3883
3300	sub new {	3884	sub new {
3301	my $class = shift;	3885	my $class = shift;
3302		3886
3303	my $self = $class->SUPER::new (	3887	my $self = $class->SUPER::new (
3304	fontsize => 0.8,	3888	fontsize => 0.8,
3305	@_,	3889	@_,
3306	);	3890	);
3307		3891
3308	Scalar::Util::weaken (my $this = $self);	3892	CFPlus::weaken (my $this = $self);
3309		3893
3310	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3894	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3311		3895
3312	$self	3896	$self
3313	}	3897	}
…		…
3315	sub reorder {	3899	sub reorder {
3316	my ($self) = @_;	3900	my ($self) = @_;
3317	my $NOW = Time::HiRes::time;	3901	my $NOW = Time::HiRes::time;
3318		3902
3319	# freeze display when hovering over any label	3903	# freeze display when hovering over any label
3320	return if $CFClient::UI::TOOLTIP->{owner}	3904	return if $CFPlus::UI::TOOLTIP->{owner}
3321	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3905	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3322	values %{ $self->{item} };	3906	values %{ $self->{item} };
3323		3907
3324	while (my ($k, $v) = each %{ $self->{item} }) {	3908	while (my ($k, $v) = each %{ $self->{item} }) {
3325	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3909	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3326	}	3910	}
…		…
3347	for ($short) {	3931	for ($short) {
3348	s/^\s+//;	3932	s/^\s+//;
3349	s/\s+/ /g;	3933	s/\s+/ /g;
3350	}	3934	}
3351		3935
3352	new CFClient::UI::Label	3936	new CFPlus::UI::Label
3353	markup => $short,	3937	markup => $short,
3354	tooltip => $item->{tooltip},	3938	tooltip => $item->{tooltip},
3355	tooltip_font => $::FONT_PROP,	3939	tooltip_font => $::FONT_PROP,
3356	tooltip_width => 0.67,	3940	tooltip_width => 0.67,
3357	fontsize => $item->{fontsize} || $self->{fontsize},	3941	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3436	$self->SUPER::destroy;	4020	$self->SUPER::destroy;
3437	}	4021	}
3438		4022
3439	#############################################################################	4023	#############################################################################
3440		4024
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;	4025	package CFPlus::UI::Root;
3606		4026
3607	our @ISA = CFClient::UI::Container::;	4027	our @ISA = CFPlus::UI::Container::;
3608		4028
3609	use List::Util qw(min max);	4029	use List::Util qw(min max);
3610		4030
3611	use CFClient::OpenGL;	4031	use CFPlus::OpenGL;
3612		4032
3613	sub new {	4033	sub new {
3614	my $class = shift;	4034	my $class = shift;
3615		4035
3616	my $self = $class->SUPER::new (	4036	my $self = $class->SUPER::new (
3617	visible => 1,	4037	visible => 1,
3618	@_,	4038	@_,
3619	);	4039	);
3620		4040
3621	Scalar::Util::weaken ($self->{root} = $self);	4041	CFPlus::weaken ($self->{root} = $self);
3622		4042
3623	$self	4043	$self
3624	}	4044	}
3625		4045
3626	sub size_request {	4046	sub size_request {
…		…
3792	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4212	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3793		4213
3794	$w = 0 if $w < 0;	4214	$w = 0 if $w < 0;
3795	$h = 0 if $h < 0;	4215	$h = 0 if $h < 0;
3796		4216
		4217	$w = max $widget->{min_w}, $w;
		4218	$h = max $widget->{min_h}, $h;
		4219
		4220	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4221	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4222
		4223	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4224	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4225
3797	$w = int $w + 0.5;	4226	$w = int $w + 0.5;
3798	$h = int $h + 0.5;	4227	$h = int $h + 0.5;
3799		4228
3800	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4229	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3801	$widget->{old_w} = $widget->{w};	4230	$widget->{old_w} = $widget->{w};
…		…
3811		4240
3812	while ($self->{post_alloc_hook}) {	4241	while ($self->{post_alloc_hook}) {
3813	$_->()	4242	$_->()
3814	for values %{delete $self->{post_alloc_hook}};	4243	for values %{delete $self->{post_alloc_hook}};
3815	}	4244	}
3816
3817		4245
3818	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4246	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3819	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4247	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3820	glClear GL_COLOR_BUFFER_BIT;	4248	glClear GL_COLOR_BUFFER_BIT;
3821		4249
…		…
3824	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4252	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3825	glMatrixMode GL_MODELVIEW;	4253	glMatrixMode GL_MODELVIEW;
3826	glLoadIdentity;	4254	glLoadIdentity;
3827		4255
3828	{	4256	{
3829	package CFClient::UI::Base;	4257	package CFPlus::UI::Base;
3830		4258
3831	($draw_x, $draw_y, $draw_w, $draw_h) =	4259	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3832	(0, 0, $self->{w}, $self->{h});	4260	(0, 0, $self->{w}, $self->{h});
3833	}
3834		4261
3835	$self->_draw;	4262	$self->_draw;
		4263	}
3836	}	4264	}
3837		4265
3838	#############################################################################	4266	#############################################################################
3839		4267
3840	package CFClient::UI;	4268	package CFPlus::UI;
3841		4269
3842	$ROOT = new CFClient::UI::Root;	4270	$ROOT = new CFPlus::UI::Root;
3843	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4271	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3844		4272
3845	1	4273	1
3846		4274

Diff Legend

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