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

Diff Legend

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